openocd-commit — OpenOCD commit maling list - read only

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-153-g3dfc0339f

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  3dfc0339fc85d467bed5cd435bb953bc7d3b9343 (commit)
      from  2096afc1b031280107ada81fb729d5e7c9075626 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3dfc0339fc85d467bed5cd435bb953bc7d3b9343
Author: Julien Massot <jul...@io...h>
Date:   Wed Jan 12 09:53:06 2022 +0100

    tcl/target: renesas gen3 Set target to armv8r for Cortex-R52
    
    Cortex-R52 is an ARMv8-R processor supporting only
    AArch32 Profile.
    
    Signed-off-by: Julien Massot <jul...@io...h>
    Change-Id: I663ae4bf1d3026d7c9e4c5950a79e7ddf1bd6564
    Reviewed-on: https://review.openocd.org/c/openocd/+/6805
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/target/renesas_rcar_gen3.cfg b/tcl/target/renesas_rcar_gen3.cfg
index 3e449832f..8dc0e7a0d 100644
--- a/tcl/target/renesas_rcar_gen3.cfg
+++ b/tcl/target/renesas_rcar_gen3.cfg
@@ -156,15 +156,20 @@ proc setup_a5x {core_name dbgbase ctibase num boot} {
 	}
 }
 
-proc setup_cr7 {core_name dbgbase ctibase num boot} {
+proc setup_crx {core_name dbgbase ctibase num boot} {
 	global _CHIPNAME
 	global _DAPNAME
 	for { set _core 0 } { $_core < $num } { incr _core } {
 		set _TARGETNAME $_CHIPNAME.$core_name
 		set _CTINAME $_TARGETNAME.cti
 		cti create $_CTINAME -dap $_DAPNAME -ap-num 1 -baseaddr $ctibase
-		set _command "target create $_TARGETNAME cortex_r4 -dap $_DAPNAME \
-			-ap-num 1 -dbgbase $dbgbase"
+		if { $core_name == "r52" } {
+			set _command "target create $_TARGETNAME armv8r -dap $_DAPNAME \
+				-ap-num 1 -dbgbase $dbgbase -cti $_CTINAME"
+		} else {
+			set _command "target create $_TARGETNAME cortex_r4 -dap $_DAPNAME \
+				-ap-num 1 -dbgbase $dbgbase"
+		}
 		if { $boot == 1 } {
 			set _targets "$_TARGETNAME"
 		} else {
@@ -177,20 +182,20 @@ proc setup_cr7 {core_name dbgbase ctibase num boot} {
 # Organize target list based on the boot core
 if { [string equal $_boot_core CA76] } {
 	setup_a5x a76 $CA76_DBGBASE $CA76_CTIBASE $_num_ca76 1
-	setup_cr7 r52 $CR52_DBGBASE $CR52_CTIBASE $_num_cr52 0
+	setup_crx r52 $CR52_DBGBASE $CR52_CTIBASE $_num_cr52 0
 } elseif { [string equal $_boot_core CA57] } {
 	setup_a5x a57 $CA57_DBGBASE $CA57_CTIBASE $_num_ca57 1
 	setup_a5x a53 $CA53_DBGBASE $CA53_CTIBASE $_num_ca53 0
-	setup_cr7 r7  $CR7_DBGBASE  $CR7_CTIBASE  $_num_cr7  0
+	setup_crx r7  $CR7_DBGBASE  $CR7_CTIBASE  $_num_cr7  0
 } elseif { [string equal $_boot_core CA53] } {
 	setup_a5x a53 $CA53_DBGBASE $CA53_CTIBASE $_num_ca53 1
 	setup_a5x a57 $CA57_DBGBASE $CA57_CTIBASE $_num_ca57 0
-	setup_cr7 r7  $CR7_DBGBASE  $CR7_CTIBASE  $_num_cr7  0
+	setup_crx r7  $CR7_DBGBASE  $CR7_CTIBASE  $_num_cr7  0
 } elseif { [string equal $_boot_core CR52] } {
-	setup_cr7 r52 $CR52_DBGBASE $CR52_CTIBASE $_num_cr52 1
+	setup_crx r52 $CR52_DBGBASE $CR52_CTIBASE $_num_cr52 1
 	setup_a5x a76 $CA76_DBGBASE $CA76_CTIBASE $_num_ca76 0
 } else {
-	setup_cr7 r7  $CR7_DBGBASE  $CR7_CTIBASE  $_num_cr7  1
+	setup_crx r7  $CR7_DBGBASE  $CR7_CTIBASE  $_num_cr7  1
 	setup_a5x a57 $CA57_DBGBASE $CA57_CTIBASE $_num_ca57 0
 	setup_a5x a53 $CA53_DBGBASE $CA53_CTIBASE $_num_ca53 0
 }

-----------------------------------------------------------------------

Summary of changes:
 tcl/target/renesas_rcar_gen3.cfg | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-152-g2096afc1b

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  2096afc1b031280107ada81fb729d5e7c9075626 (commit)
      from  0bb0056abc269ed14b04cbb1d768fb0281e64225 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2096afc1b031280107ada81fb729d5e7c9075626
Author: Julien Massot <jul...@io...h>
Date:   Tue Feb 1 13:44:05 2022 +0100

    aarch64: Add support for ARMv8-R
    
    ARMv8-R platforms are similar to ARMv8-A regarding
    JTAG and most cpu registers. ARMv8-R doesn't has MMU
    but has MPU instead.
    
    ARMv8-R platforms can be AArch32 only such as Cortex-R52,
    or AArch64 capable like Cortex-R82.
    
    Signed-off-by: Julien Massot <jul...@io...h>
    Change-Id: Ib086f71685d1e3704b396d478ae9399dd8a391e1
    Reviewed-on: https://review.openocd.org/c/openocd/+/6843
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/aarch64.c b/src/target/aarch64.c
index 3c33032e9..6c9673fa2 100644
--- a/src/target/aarch64.c
+++ b/src/target/aarch64.c
@@ -1066,9 +1066,12 @@ static int aarch64_post_debug_entry(struct target *target)
 		armv8_identify_cache(armv8);
 		armv8_read_mpidr(armv8);
 	}
-
-	armv8->armv8_mmu.mmu_enabled =
+	if (armv8->is_armv8r) {
+		armv8->armv8_mmu.mmu_enabled = 0;
+	} else {
+		armv8->armv8_mmu.mmu_enabled =
 			(aarch64->system_control_reg & 0x1U) ? 1 : 0;
+	}
 	armv8->armv8_mmu.armv8_cache.d_u_cache_enabled =
 		(aarch64->system_control_reg & 0x4U) ? 1 : 0;
 	armv8->armv8_mmu.armv8_cache.i_cache_enabled =
@@ -2726,6 +2729,25 @@ static int aarch64_init_arch_info(struct target *target,
 	return ERROR_OK;
 }
 
+static int armv8r_target_create(struct target *target, Jim_Interp *interp)
+{
+	struct aarch64_private_config *pc = target->private_config;
+	struct aarch64_common *aarch64;
+
+	if (adiv5_verify_config(&pc->adiv5_config) != ERROR_OK)
+		return ERROR_FAIL;
+
+	aarch64 = calloc(1, sizeof(struct aarch64_common));
+	if (!aarch64) {
+		LOG_ERROR("Out of memory");
+		return ERROR_FAIL;
+	}
+
+	aarch64->armv8_common.is_armv8r = true;
+
+	return aarch64_init_arch_info(target, aarch64, pc->adiv5_config.dap);
+}
+
 static int aarch64_target_create(struct target *target, Jim_Interp *interp)
 {
 	struct aarch64_private_config *pc = target->private_config;
@@ -2740,6 +2762,8 @@ static int aarch64_target_create(struct target *target, Jim_Interp *interp)
 		return ERROR_FAIL;
 	}
 
+	aarch64->armv8_common.is_armv8r = false;
+
 	return aarch64_init_arch_info(target, aarch64, pc->adiv5_config.dap);
 }
 
@@ -2762,12 +2786,16 @@ static void aarch64_deinit_target(struct target *target)
 
 static int aarch64_mmu(struct target *target, int *enabled)
 {
+	struct aarch64_common *aarch64 = target_to_aarch64(target);
+	struct armv8_common *armv8 = &aarch64->armv8_common;
 	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("%s: target %s not halted", __func__, target_name(target));
 		return ERROR_TARGET_INVALID;
 	}
-
-	*enabled = target_to_aarch64(target)->armv8_common.armv8_mmu.mmu_enabled;
+	if (armv8->is_armv8r)
+		*enabled = 0;
+	else
+		*enabled = target_to_aarch64(target)->armv8_common.armv8_mmu.mmu_enabled;
 	return ERROR_OK;
 }
 
@@ -3165,3 +3193,39 @@ struct target_type aarch64_target = {
 	.mmu = aarch64_mmu,
 	.virt2phys = aarch64_virt2phys,
 };
+
+struct target_type armv8r_target = {
+	.name = "armv8r",
+
+	.poll = aarch64_poll,
+	.arch_state = armv8_arch_state,
+
+	.halt = aarch64_halt,
+	.resume = aarch64_resume,
+	.step = aarch64_step,
+
+	.assert_reset = aarch64_assert_reset,
+	.deassert_reset = aarch64_deassert_reset,
+
+	/* REVISIT allow exporting VFP3 registers ... */
+	.get_gdb_arch = armv8_get_gdb_arch,
+	.get_gdb_reg_list = armv8_get_gdb_reg_list,
+
+	.read_memory = aarch64_read_phys_memory,
+	.write_memory = aarch64_write_phys_memory,
+
+	.add_breakpoint = aarch64_add_breakpoint,
+	.add_context_breakpoint = aarch64_add_context_breakpoint,
+	.add_hybrid_breakpoint = aarch64_add_hybrid_breakpoint,
+	.remove_breakpoint = aarch64_remove_breakpoint,
+	.add_watchpoint = aarch64_add_watchpoint,
+	.remove_watchpoint = aarch64_remove_watchpoint,
+	.hit_watchpoint = aarch64_hit_watchpoint,
+
+	.commands = aarch64_command_handlers,
+	.target_create = armv8r_target_create,
+	.target_jim_configure = aarch64_jim_configure,
+	.init_target = aarch64_init_target,
+	.deinit_target = aarch64_deinit_target,
+	.examine = aarch64_examine,
+};
diff --git a/src/target/armv8.h b/src/target/armv8.h
index 54aa08634..f5aa21109 100644
--- a/src/target/armv8.h
+++ b/src/target/armv8.h
@@ -204,6 +204,7 @@ struct armv8_common {
 	uint8_t pa_size;
 	uint32_t page_size;
 	uint64_t ttbr_base;
+	bool is_armv8r;
 
 	struct armv8_mmu_common armv8_mmu;
 
diff --git a/src/target/target.c b/src/target/target.c
index 47abd2823..6c0f4afb1 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -82,6 +82,7 @@ extern struct target_type cortexm_target;
 extern struct target_type cortexa_target;
 extern struct target_type aarch64_target;
 extern struct target_type cortexr4_target;
+extern struct target_type armv8r_target;
 extern struct target_type arm11_target;
 extern struct target_type ls1_sap_target;
 extern struct target_type mips_m4k_target;
@@ -141,6 +142,7 @@ static struct target_type *target_types[] = {
 	&esirisc_target,
 	&arcv2_target,
 	&aarch64_target,
+	&armv8r_target,
 	&mips_mips64_target,
 	NULL,
 };

-----------------------------------------------------------------------

Summary of changes:
 src/target/aarch64.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++---
 src/target/armv8.h   |  1 +
 src/target/target.c  |  2 ++
 3 files changed, 71 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-151-g0bb0056ab

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  0bb0056abc269ed14b04cbb1d768fb0281e64225 (commit)
      from  91bd4313444c5a949ce49d88ab487608df7d6c37 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0bb0056abc269ed14b04cbb1d768fb0281e64225
Author: Julien Massot <jul...@io...h>
Date:   Wed Jan 12 14:10:36 2022 +0100

    target:armv8: aarch32 do not try to restore same EL
    
    While debugging a Cortex-R52 OpenOCD fail to restore context
    on line
    retval = dpm->instr_write_data_r0(dpm,
                    ARMV8_MSR_GP_xPSR_T1(1, 0, 15), cpsr);
    
    which trigger this exception:
    
    aarch64.c:1206 aarch64_restore_context(): r8a779a0.r52
    armv8_dpm.c:560 armv8_dpm_modeswitch(): restoring mode, cpsr = 0x0000011f
    1262753 armv8_dpm.c:598 armv8_dpm_modeswitch(): target_el = 1, last_el = 1
    armv8_dpm.c:611 armv8_dpm_modeswitch(): SPSR = 0x0000011f
    armv8_dpm.c:260 dpmv8_exec_opcode(): Opcode 0x8f00f390, DSCR.ERR=1, DSCR.EL=1
    
    and finally OpenOCD doesn't succeed to restore the processor.
    
    This check 'dpm->last_el != target_el' exist for aarch64,
    so might be correct for aarch32 too.
    
    Signed-off-by: Julien Massot <jul...@io...h>
    Change-Id: I41d1006233251dcaf6d69bda580488b204b7eb63
    Reviewed-on: https://review.openocd.org/c/openocd/+/6807
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/armv8_dpm.c b/src/target/armv8_dpm.c
index f40beb847..fcd4d5971 100644
--- a/src/target/armv8_dpm.c
+++ b/src/target/armv8_dpm.c
@@ -587,6 +587,9 @@ int armv8_dpm_modeswitch(struct arm_dpm *dpm, enum arm_mode mode)
 	}
 
 	LOG_DEBUG("target_el = %i, last_el = %i", target_el, dpm->last_el);
+	if (dpm->last_el == target_el)
+		return ERROR_OK; /* nothing to do */
+
 	if (target_el > dpm->last_el) {
 		retval = dpm->instr_execute(dpm,
 				armv8_opcode(armv8, ARMV8_OPC_DCPS) | target_el);

-----------------------------------------------------------------------

Summary of changes:
 src/target/armv8_dpm.c | 3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-150-g91bd43134

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  91bd4313444c5a949ce49d88ab487608df7d6c37 (commit)
      from  95c27731d4f76c0554147030075ab476d68f9f83 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 91bd4313444c5a949ce49d88ab487608df7d6c37
Author: Daniel Anselmi <dan...@gm...>
Date:   Wed Dec 14 09:27:38 2022 +0100

    pld: move file sanity checks to pld.c
    
    Change-Id: Id64b1165b25a03634949ac22b8af16eb0e24c1fa
    Signed-off-by: Daniel Anselmi <dan...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7388
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/pld/pld.c b/src/pld/pld.c
index e2e0ef413..af1836907 100644
--- a/src/pld/pld.c
+++ b/src/pld/pld.c
@@ -10,6 +10,7 @@
 #endif
 
 #include "pld.h"
+#include <sys/stat.h>
 #include <helper/log.h>
 #include <helper/replacements.h>
 #include <helper/time_support.h>
@@ -134,6 +135,22 @@ COMMAND_HANDLER(handle_pld_load_command)
 		return ERROR_OK;
 	}
 
+	struct stat input_stat;
+	if (stat(CMD_ARGV[1], &input_stat) == -1) {
+		LOG_ERROR("couldn't stat() %s: %s", CMD_ARGV[1], strerror(errno));
+		return ERROR_PLD_FILE_LOAD_FAILED;
+	}
+
+	if (S_ISDIR(input_stat.st_mode)) {
+		LOG_ERROR("%s is a directory", CMD_ARGV[1]);
+		return ERROR_PLD_FILE_LOAD_FAILED;
+	}
+
+	if (input_stat.st_size == 0) {
+		LOG_ERROR("Empty file %s", CMD_ARGV[1]);
+		return ERROR_PLD_FILE_LOAD_FAILED;
+	}
+
 	retval = p->driver->load(p, CMD_ARGV[1]);
 	if (retval != ERROR_OK) {
 		command_print(CMD, "failed loading file %s to pld device %u",
diff --git a/src/pld/xilinx_bit.c b/src/pld/xilinx_bit.c
index 792b3375b..e4cc52ef9 100644
--- a/src/pld/xilinx_bit.c
+++ b/src/pld/xilinx_bit.c
@@ -13,7 +13,6 @@
 #include "pld.h"
 #include <helper/log.h>
 
-#include <sys/stat.h>
 #include <helper/system.h>
 
 static int read_section(FILE *input_file, int length_size, char section,
@@ -60,27 +59,11 @@ static int read_section(FILE *input_file, int length_size, char section,
 int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename)
 {
 	FILE *input_file;
-	struct stat input_stat;
 	int read_count;
 
 	if (!filename || !bit_file)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	if (stat(filename, &input_stat) == -1) {
-		LOG_ERROR("couldn't stat() %s: %s", filename, strerror(errno));
-		return ERROR_PLD_FILE_LOAD_FAILED;
-	}
-
-	if (S_ISDIR(input_stat.st_mode)) {
-		LOG_ERROR("%s is a directory", filename);
-		return ERROR_PLD_FILE_LOAD_FAILED;
-	}
-
-	if (input_stat.st_size == 0) {
-		LOG_ERROR("Empty file %s", filename);
-		return ERROR_PLD_FILE_LOAD_FAILED;
-	}
-
 	input_file = fopen(filename, "rb");
 	if (!input_file) {
 		LOG_ERROR("couldn't open %s: %s", filename, strerror(errno));

-----------------------------------------------------------------------

Summary of changes:
 src/pld/pld.c        | 17 +++++++++++++++++
 src/pld/xilinx_bit.c | 17 -----------------
 2 files changed, 17 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-149-g95c27731d

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  95c27731d4f76c0554147030075ab476d68f9f83 (commit)
      from  1e6df1675ccea95d99d767e6d2b9a735c8ee2a36 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 95c27731d4f76c0554147030075ab476d68f9f83
Author: Mark Zhuang <mar...@sp...>
Date:   Mon Apr 10 10:57:55 2023 +0800

    flash/rsl10: fix typo
    
    Change-Id: I11af37309fe4684fcb340a00fcc7b2096b8dad76
    Signed-off-by: Mark Zhuang <mar...@sp...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7584
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/contrib/loaders/flash/rsl10/rom_launcher.S b/contrib/loaders/flash/rsl10/rom_launcher.S
index 70f000e72..aafedfb46 100644
--- a/contrib/loaders/flash/rsl10/rom_launcher.S
+++ b/contrib/loaders/flash/rsl10/rom_launcher.S
@@ -21,7 +21,7 @@
 	.global _start
 _start:
 launch_program_in_rom:
-    // variables are already set, addres to jump is in r3
+    // variables are already set, address to jump is in r3
     blx r3
 exit:
 	// Wait for OpenOCD

-----------------------------------------------------------------------

Summary of changes:
 contrib/loaders/flash/rsl10/rom_launcher.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-148-g1e6df1675

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  1e6df1675ccea95d99d767e6d2b9a735c8ee2a36 (commit)
      from  1c31f6225f41dd2bd371571e829fbf6855788d24 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1e6df1675ccea95d99d767e6d2b9a735c8ee2a36
Author: panciyan <pan...@es...>
Date:   Sun Apr 2 05:17:17 2023 +0000

    rtos/linux.c: Fix Linux user space border check
    
    Linux kernel and user space border is 0xc0000000 not 0xc000000
    
    Signed-off-by: panciyan <pan...@es...>
    Change-Id: I6b487cce62ac31737deca97d5f5f7bbc081280f4
    Reviewed-on: https://review.openocd.org/c/openocd/+/7570
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/rtos/linux.c b/src/rtos/linux.c
index f9edabc2b..7517ec7a9 100644
--- a/src/rtos/linux.c
+++ b/src/rtos/linux.c
@@ -123,7 +123,7 @@ static int linux_read_memory(struct target *target,
 		target->rtos->rtos_specific_params;
 	uint32_t pa = (address & linux_os->phys_mask) + linux_os->phys_base;
 #endif
-	if (address < 0xc000000) {
+	if (address < 0xc0000000) {
 		LOG_ERROR("linux awareness : address in user space");
 		return ERROR_FAIL;
 	}

-----------------------------------------------------------------------

Summary of changes:
 src/rtos/linux.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-147-g1c31f6225

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  1c31f6225f41dd2bd371571e829fbf6855788d24 (commit)
      from  8d1dcf293a0cee71b264787c65749de3f6c4d8bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1c31f6225f41dd2bd371571e829fbf6855788d24
Author: panciyan <pan...@es...>
Date:   Fri Mar 31 15:12:08 2023 +0000

    src/server: Fix memory leak of reg_list
    
    memory leak of reg_list when local_list realloc fail.
    
    Signed-off-by: panciyan <pan...@es...>
    Change-Id: I6b09137ecd132ab326205f5a575a38bcc82e8469
    Reviewed-on: https://review.openocd.org/c/openocd/+/7566
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index d8dbc2c8b..b15a6c1c3 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -2348,6 +2348,7 @@ static int smp_reg_list_noread(struct target *target,
 						local_list = realloc(local_list, combined_allocated * sizeof(struct reg *));
 						if (!local_list) {
 							LOG_ERROR("realloc(%zu) failed", combined_allocated * sizeof(struct reg *));
+							free(reg_list);
 							return ERROR_FAIL;
 						}
 					}

-----------------------------------------------------------------------

Summary of changes:
 src/server/gdb_server.c | 1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-146-g8d1dcf293

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  8d1dcf293a0cee71b264787c65749de3f6c4d8bc (commit)
      from  0384fe5d596f42388f8b84d42959d899f29388ab (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8d1dcf293a0cee71b264787c65749de3f6c4d8bc
Author: Erhan Kurubas <erh...@es...>
Date:   Thu Aug 25 15:38:34 2022 +0300

    target/espressif: add application tracing functionality over JTAG
    
    This feature allows to transfer arbitrary data between host and
    ESP32 via JTAG.
    
    The main use cases:
    
    1- Collecting application specific data
    2- Lightweight logging to the host
    3- System behaviour analysis with SEGGER SystemView
    4- Source code coverage
    
    Signed-off-by: Erhan Kurubas <erh...@es...>
    Change-Id: I95dee00ac22891fa326915a3fcac3c088cbb2afc
    Reviewed-on: https://review.openocd.org/c/openocd/+/7163
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index fe72cf5fa..4154e56b5 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -11137,6 +11137,46 @@ Stop current trace as started by the tracestart command.
 Dump trace memory to a file.
 @end deffn
 
+@section Espressif Specific Commands
+
+@deffn {Command} {esp apptrace} (start <destination> [<poll_period> [<trace_size> [<stop_tmo> [<wait4halt> [<skip_size>]]]]])
+Starts
+@uref{https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/app_trace.html#application-level-tracing-library, application level tracing}.
+Data will be stored to specified destination. Available destinations are:
+@itemize @bullet
+@item @code{file://<outfile>} - Save trace logs into file.
+@item @code{tcp://<host>:<port>} - Send trace logs to tcp port on specified host. OpenOCD will act as a tcp client.
+@item @code{con:} - Print trace logs to the stdout.
+@end itemize
+Other parameters will be same for each destination.
+@itemize @bullet
+@item @code{poll_period} - trace data polling period in ms.
+@item @code{trace_size} - maximum trace data size.
+Tracing will be stopped automatically when that amount is reached.
+Use "-1" to disable the limitation.
+@item @code{stop_tmo} - Data reception timeout in ms.
+Tracing will be stopped automatically when no data is received within that period.
+@item @code{wait4halt} - if non-zero then wait for target to be halted before tracing start.
+@item @code{skip_size} - amount of tracing data to be skipped before writing it to destination.
+@end itemize
+@end deffn
+
+@deffn {Command} {esp apptrace} (stop)
+Stops tracing started with above command.
+@end deffn
+
+@deffn {Command} {esp apptrace} (status)
+Requests ongoing tracing status.
+@end deffn
+
+@deffn {Command} {esp apptrace} (dump file://<outfile>)
+Dumps tracing data from target buffer. It can be useful to dump the latest data
+buffered on target for post-mortem analysis. For example when target starts tracing automatically
+w/o OpenOCD command and keeps only the latest data window which fit into the buffer.
+@uref{https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/app_trace.html#application-level-tracing-library, application level tracing}.
+Data will be stored to specified destination.
+@end deffn
+
 @anchor{softwaredebugmessagesandtracing}
 @section Software Debug Messages and Tracing
 @cindex Linux-ARM DCC support
diff --git a/src/target/espressif/Makefile.am b/src/target/espressif/Makefile.am
index 8367a3881..c1759ed77 100644
--- a/src/target/espressif/Makefile.am
+++ b/src/target/espressif/Makefile.am
@@ -8,6 +8,10 @@ noinst_LTLIBRARIES += %D%/libespressif.la
        %D%/esp_xtensa_smp.h \
        %D%/esp_xtensa_semihosting.c \
        %D%/esp_xtensa_semihosting.h \
+       %D%/esp_xtensa_apptrace.c \
+       %D%/esp_xtensa_apptrace.h \
+       %D%/esp32_apptrace.c \
+       %D%/esp32_apptrace.h \
        %D%/esp32.c \
        %D%/esp32s2.c \
        %D%/esp32s3.c \
diff --git a/src/target/espressif/esp32.c b/src/target/espressif/esp32.c
index 63055cf18..74bbe50bd 100644
--- a/src/target/espressif/esp32.c
+++ b/src/target/espressif/esp32.c
@@ -440,6 +440,11 @@ static const struct command_registration esp32_command_handlers[] = {
 	{
 		.chain = esp_xtensa_smp_command_handlers,
 	},
+	{
+		.name = "esp",
+		.usage = "",
+		.chain = esp32_apptrace_command_handlers,
+	},
 	{
 		.name = "esp32",
 		.usage = "",
diff --git a/src/target/espressif/esp32_apptrace.c b/src/target/espressif/esp32_apptrace.c
new file mode 100644
index 000000000..dfeb79401
--- /dev/null
+++ b/src/target/espressif/esp32_apptrace.c
@@ -0,0 +1,1376 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/***************************************************************************
+ *   ESP32xx application tracing module for OpenOCD                        *
+ *   Copyright (C) 2017 Espressif Systems Ltd.                             *
+ ***************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef HAVE_ARPA_INET_H
+#include <arpa/inet.h>
+#endif
+
+#ifdef HAVE_NETDB_H
+#include <netdb.h>
+#endif
+
+#ifndef _WIN32
+#include <netinet/tcp.h>
+#include <sys/ioctl.h>
+#endif
+
+#include <helper/list.h>
+#include <helper/time_support.h>
+#include <target/target.h>
+#include <target/target_type.h>
+#include <target/smp.h>
+#include <server/server.h>
+#include "esp_xtensa.h"
+#include "esp_xtensa_smp.h"
+#include "esp_xtensa_apptrace.h"
+#include "esp32_apptrace.h"
+
+#define ESP32_APPTRACE_USER_BLOCK_CORE(_v_)     ((_v_) >> 15)
+#define ESP32_APPTRACE_USER_BLOCK_LEN(_v_)      ((_v_) & ~BIT(15))
+
+#define ESP32_APPTRACE_USER_BLOCK_HDR_SZ        4
+
+#define ESP_APPTRACE_CMD_MODE_GEN               0
+#define ESP_APPTRACE_CMD_MODE_SYSVIEW           1
+#define ESP_APPTRACE_CMD_MODE_SYSVIEW_MCORE     2
+#define ESP_APPTRACE_CMD_MODE_SYNC              3
+
+#define ESP32_APPTRACE_TGT_STATE_TMO            5000
+#define ESP_APPTRACE_BLOCKS_POOL_SZ             10
+
+struct esp32_apptrace_dest_file_data {
+	int fout;
+};
+
+struct esp32_apptrace_dest_tcp_data {
+	int sockfd;
+};
+
+struct esp32_apptrace_target_state {
+	int running;
+	uint32_t block_id;
+	uint32_t data_len;
+};
+
+struct esp_apptrace_target2host_hdr {
+	uint16_t block_sz;
+	uint16_t wr_sz;
+};
+#define APPTRACE_BLOCK_SIZE_OFFSET      0
+#define APPTRACE_WR_SIZE_OFFSET         2
+
+struct esp32_apptrace_block {
+	struct list_head node;
+	uint8_t *data;
+	uint32_t data_len;
+};
+
+static int esp32_apptrace_data_processor(void *priv);
+static int esp32_apptrace_get_data_info(struct esp32_apptrace_cmd_ctx *ctx,
+	struct esp32_apptrace_target_state *target_state,
+	uint32_t *fired_target_num);
+static int esp32_apptrace_safe_halt_targets(struct esp32_apptrace_cmd_ctx *ctx,
+	struct esp32_apptrace_target_state *targets);
+static struct esp32_apptrace_block *esp32_apptrace_free_block_get(struct esp32_apptrace_cmd_ctx *ctx);
+static int esp32_apptrace_handle_trace_block(struct esp32_apptrace_cmd_ctx *ctx,
+	struct esp32_apptrace_block *block);
+
+static const bool s_time_stats_enable = true;
+
+/*********************************************************************
+*                       Trace destination API
+**********************************************************************/
+
+static int esp32_apptrace_file_dest_write(void *priv, uint8_t *data, int size)
+{
+	struct esp32_apptrace_dest_file_data *dest_data = (struct esp32_apptrace_dest_file_data *)priv;
+
+	int wr_sz = write(dest_data->fout, data, size);
+	if (wr_sz != size) {
+		LOG_ERROR("Failed to write %d bytes to out file (%d)! Written %d.", size, errno, wr_sz);
+		return ERROR_FAIL;
+	}
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_file_dest_cleanup(void *priv)
+{
+	struct esp32_apptrace_dest_file_data *dest_data = (struct esp32_apptrace_dest_file_data *)priv;
+
+	if (dest_data->fout > 0)
+		close(dest_data->fout);
+	free(dest_data);
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_file_dest_init(struct esp32_apptrace_dest *dest, const char *dest_name)
+{
+	struct esp32_apptrace_dest_file_data *dest_data = calloc(1, sizeof(*dest_data));
+	if (!dest_data) {
+		LOG_ERROR("Failed to alloc mem for file dest!");
+		return ERROR_FAIL;
+	}
+
+	LOG_INFO("Open file %s", dest_name);
+	dest_data->fout = open(dest_name, O_WRONLY | O_CREAT | O_TRUNC | O_BINARY, 0666);
+	if (dest_data->fout <= 0) {
+		LOG_ERROR("Failed to open file %s", dest_name);
+		free(dest_data);
+		return ERROR_FAIL;
+	}
+
+	dest->priv = dest_data;
+	dest->write = esp32_apptrace_file_dest_write;
+	dest->clean = esp32_apptrace_file_dest_cleanup;
+	dest->log_progress = true;
+
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_console_dest_write(void *priv, uint8_t *data, int size)
+{
+	LOG_USER_N("%.*s", size, data);
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_console_dest_cleanup(void *priv)
+{
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_console_dest_init(struct esp32_apptrace_dest *dest, const char *dest_name)
+{
+	dest->priv = NULL;
+	dest->write = esp32_apptrace_console_dest_write;
+	dest->clean = esp32_apptrace_console_dest_cleanup;
+	dest->log_progress = false;
+
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_tcp_dest_write(void *priv, uint8_t *data, int size)
+{
+	struct esp32_apptrace_dest_tcp_data *dest_data = (struct esp32_apptrace_dest_tcp_data *)priv;
+	int wr_sz = write_socket(dest_data->sockfd, data, size);
+	if (wr_sz != size) {
+		LOG_ERROR("Failed to write %u bytes to out socket (%d)! Written %d.", size, errno, wr_sz);
+		return ERROR_FAIL;
+	}
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_tcp_dest_cleanup(void *priv)
+{
+	struct esp32_apptrace_dest_tcp_data *dest_data = (struct esp32_apptrace_dest_tcp_data *)priv;
+
+	if (dest_data->sockfd > 0)
+		close_socket(dest_data->sockfd);
+	free(dest_data);
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_tcp_dest_init(struct esp32_apptrace_dest *dest, const char *dest_name)
+{
+	const char *port_sep = strchr(dest_name, ':');
+	/* separator not found, or was the first or the last character */
+	if (!port_sep || port_sep == dest_name || port_sep == dest_name + strlen(dest_name) - 1) {
+		LOG_ERROR("apptrace: Invalid connection URI, format should be tcp://host:port");
+		return ERROR_COMMAND_ARGUMENT_INVALID;
+	}
+	size_t hostname_len = port_sep - dest_name;
+
+	char hostname[64] = { 0 };
+	if (hostname_len >= sizeof(hostname)) {
+		LOG_ERROR("apptrace: Hostname too long");
+		return ERROR_COMMAND_ARGUMENT_INVALID;
+	}
+	memcpy(hostname, dest_name, hostname_len);
+
+	const char *port_str = port_sep + 1;
+	struct addrinfo *ai;
+	int flags = 0;
+#ifdef AI_NUMERICSERV
+	flags |= AI_NUMERICSERV;
+#endif	/* AI_NUMERICSERV */
+	struct addrinfo hint = {
+		.ai_family = AF_UNSPEC,
+		.ai_socktype = SOCK_STREAM,
+		.ai_protocol = 0,
+		.ai_flags = flags
+	};
+	int res = getaddrinfo(hostname, port_str, &hint, &ai);
+	if (res != 0) {
+		LOG_ERROR("apptrace: Failed to resolve host name: %s", hostname);
+		return ERROR_FAIL;
+	}
+	int sockfd = -1;
+	for (struct addrinfo *ai_it = ai; ai_it; ai_it = ai_it->ai_next) {
+		sockfd = socket(ai_it->ai_family, ai_it->ai_socktype, ai_it->ai_protocol);
+		if (sockfd < 0) {
+			LOG_DEBUG("apptrace: Failed to create socket (%d, %d, %d) (%s)",
+				ai_it->ai_family,
+				ai_it->ai_socktype,
+				ai_it->ai_protocol,
+				strerror(errno));
+			continue;
+		}
+
+		char cur_hostname[NI_MAXHOST];
+		char cur_portname[NI_MAXSERV];
+		res =
+			getnameinfo(ai_it->ai_addr, ai_it->ai_addrlen, cur_hostname,
+			sizeof(cur_hostname),
+			cur_portname, sizeof(cur_portname),
+			NI_NUMERICHOST | NI_NUMERICSERV);
+		if (res != 0)
+			continue;
+
+		LOG_INFO("apptrace: Trying to connect to %s:%s", cur_hostname, cur_portname);
+		if (connect(sockfd, ai_it->ai_addr, ai_it->ai_addrlen) < 0) {
+			close_socket(sockfd);
+			sockfd = -1;
+			LOG_WARNING("apptrace: Connection failed (%s)", strerror(errno));
+			continue;
+		}
+		break;
+	}
+	freeaddrinfo(ai);
+	if (sockfd < 0) {
+		LOG_ERROR("apptrace: Could not connect to %s:%s", hostname, port_str);
+		return ERROR_FAIL;
+	}
+	LOG_INFO("apptrace: Connected!");
+
+	struct esp32_apptrace_dest_tcp_data *dest_data = calloc(1, sizeof(struct esp32_apptrace_dest_tcp_data));
+	if (!dest_data) {
+		LOG_ERROR("apptrace: Failed to alloc mem for tcp dest!");
+		close_socket(sockfd);
+		return ERROR_FAIL;
+	}
+
+	dest_data->sockfd = sockfd;
+	dest->priv = dest_data;
+	dest->write = esp32_apptrace_tcp_dest_write;
+	dest->clean = esp32_apptrace_tcp_dest_cleanup;
+	dest->log_progress = true;
+
+	return ERROR_OK;
+}
+
+int esp32_apptrace_dest_init(struct esp32_apptrace_dest dest[], const char *dest_paths[], unsigned int max_dests)
+{
+	int res;
+	unsigned int i;
+
+	for (i = 0; i < max_dests; i++) {
+		if (strncmp(dest_paths[i], "file://", 7) == 0)
+			res = esp32_apptrace_file_dest_init(&dest[i], &dest_paths[i][7]);
+		else if (strncmp(dest_paths[i], "con:", 4) == 0)
+			res = esp32_apptrace_console_dest_init(&dest[i], NULL);
+		else if (strncmp(dest_paths[i], "tcp://", 6) == 0)
+			res = esp32_apptrace_tcp_dest_init(&dest[i], &dest_paths[i][6]);
+		else
+			break;
+
+		if (res != ERROR_OK) {
+			LOG_ERROR("apptrace: Failed to init trace data destination '%s'!", dest_paths[i]);
+			return 0;
+		}
+	}
+
+	return i;
+}
+
+int esp32_apptrace_dest_cleanup(struct esp32_apptrace_dest dest[], unsigned int max_dests)
+{
+	for (unsigned int i = 0; i < max_dests; i++) {
+		if (dest[i].clean && dest[i].priv) {
+			int res = dest[i].clean(dest[i].priv);
+			dest[i].priv = NULL;
+			return res;
+		}
+	}
+	return ERROR_OK;
+}
+
+/*********************************************************************
+*                 Trace data blocks management API
+**********************************************************************/
+static void esp32_apptrace_blocks_pool_cleanup(struct esp32_apptrace_cmd_ctx *ctx)
+{
+	struct esp32_apptrace_block *cur;
+	struct list_head *head = &ctx->free_trace_blocks;
+	struct list_head *tmp, *pos;
+
+	list_for_each_safe(pos, tmp, head) {
+		cur = list_entry(pos, struct esp32_apptrace_block, node);
+		if (cur) {
+			list_del(&cur->node);
+			free(cur->data);
+			free(cur);
+		}
+	}
+
+	head = &ctx->ready_trace_blocks;
+
+	list_for_each_safe(pos, tmp, head) {
+		cur = list_entry(pos, struct esp32_apptrace_block, node);
+		if (cur) {
+			list_del(&cur->node);
+			free(cur->data);
+			free(cur);
+		}
+	}
+}
+
+struct esp32_apptrace_block *esp32_apptrace_free_block_get(struct esp32_apptrace_cmd_ctx *ctx)
+{
+	struct esp32_apptrace_block *block = NULL;
+
+	if (!list_empty(&ctx->free_trace_blocks)) {
+		/*get first */
+		block = list_first_entry(&ctx->free_trace_blocks, struct esp32_apptrace_block, node);
+		list_del(&block->node);
+	}
+
+	return block;
+}
+
+static int esp32_apptrace_ready_block_put(struct esp32_apptrace_cmd_ctx *ctx, struct esp32_apptrace_block *block)
+{
+	LOG_DEBUG("esp32_apptrace_ready_block_put");
+	/* add to ready blocks list */
+	INIT_LIST_HEAD(&block->node);
+	list_add(&block->node, &ctx->ready_trace_blocks);
+
+	return ERROR_OK;
+}
+
+static struct esp32_apptrace_block *esp32_apptrace_ready_block_get(struct esp32_apptrace_cmd_ctx *ctx)
+{
+	struct esp32_apptrace_block *block = NULL;
+
+	if (!list_empty(&ctx->ready_trace_blocks)) {
+		struct list_head *head = &ctx->ready_trace_blocks;
+		struct list_head *tmp, *pos;
+
+		list_for_each_safe(pos, tmp, head) {
+			block = list_entry(pos, struct esp32_apptrace_block, node);
+		}
+		/* remove it from ready list */
+		list_del(&block->node);
+	}
+
+	return block;
+}
+
+static int esp32_apptrace_block_free(struct esp32_apptrace_cmd_ctx *ctx, struct esp32_apptrace_block *block)
+{
+	/* add to free blocks list */
+	INIT_LIST_HEAD(&block->node);
+	list_add(&block->node, &ctx->free_trace_blocks);
+
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_wait_tracing_finished(struct esp32_apptrace_cmd_ctx *ctx)
+{
+	int64_t timeout = timeval_ms() + (LOG_LEVEL_IS(LOG_LVL_DEBUG) ? 70000 : 5000);
+	while (!list_empty(&ctx->ready_trace_blocks)) {
+		alive_sleep(100);
+		if (timeval_ms() >= timeout) {
+			LOG_ERROR("Failed to wait for pended trace blocks!");
+			return ERROR_FAIL;
+		}
+	}
+	/* signal timer callback to stop */
+	ctx->running = 0;
+	target_unregister_timer_callback(esp32_apptrace_data_processor, ctx);
+	return ERROR_OK;
+}
+
+/*********************************************************************
+*                          Trace commands
+**********************************************************************/
+
+int esp32_apptrace_cmd_ctx_init(struct esp32_apptrace_cmd_ctx *cmd_ctx, struct command_invocation *cmd, int mode)
+{
+	struct target *target = get_current_target(CMD_CTX);
+
+	memset(cmd_ctx, 0, sizeof(struct esp32_apptrace_cmd_ctx));
+	cmd_ctx->target = target;
+	cmd_ctx->mode = mode;
+	cmd_ctx->target_state = target->state;
+	cmd_ctx->cmd = cmd;
+
+	if (target->smp) {
+		struct target_list *head;
+		struct target *curr;
+		unsigned int i = 0;
+		cmd_ctx->cores_num = 0;
+		foreach_smp_target(head, target->smp_targets) {
+			curr = head->target;
+			if (i == ESP32_APPTRACE_MAX_CORES_NUM) {
+				command_print(cmd, "Too many cores configured! Max %d cores are supported.",
+					ESP32_APPTRACE_MAX_CORES_NUM);
+				return ERROR_FAIL;
+			}
+			if (!target_was_examined(curr))
+				continue;
+			cmd_ctx->cores_num++;
+			cmd_ctx->cpus[i++] = curr;
+		}
+	} else {
+		cmd_ctx->cores_num = 1;
+		cmd_ctx->cpus[0] = target;
+	}
+	/* some relies on ESP32_APPTRACE_MAX_CORES_NUM
+	 * TODO: remove that dependency */
+	assert(cmd_ctx->cores_num <= ESP32_APPTRACE_MAX_CORES_NUM && "Too many cores number!");
+
+	struct xtensa *xtensa = target->arch_info;
+	if (xtensa->common_magic == XTENSA_COMMON_MAGIC) {
+		cmd_ctx->hw = target_to_esp_xtensa(target)->apptrace.hw;
+	} else { /* TODO: riscv is not supported yet */
+		command_print(cmd, "Unsupported target arch 0x%X", xtensa->common_magic);
+		return ERROR_FAIL;
+	}
+
+	cmd_ctx->max_trace_block_sz = cmd_ctx->hw->max_block_size_get(cmd_ctx->cpus[0]);
+	if (cmd_ctx->max_trace_block_sz == 0) {
+		command_print(cmd, "Failed to get max trace block size!");
+		return ERROR_FAIL;
+	}
+	LOG_INFO("Total trace memory: %" PRIu32 " bytes", cmd_ctx->max_trace_block_sz);
+
+	INIT_LIST_HEAD(&cmd_ctx->ready_trace_blocks);
+	INIT_LIST_HEAD(&cmd_ctx->free_trace_blocks);
+	for (unsigned int i = 0; i < ESP_APPTRACE_BLOCKS_POOL_SZ; i++) {
+		struct esp32_apptrace_block *block = calloc(1, sizeof(struct esp32_apptrace_block));
+		if (!block) {
+			command_print(cmd, "Failed to alloc trace buffer entry!");
+			esp32_apptrace_blocks_pool_cleanup(cmd_ctx);
+			return ERROR_FAIL;
+		}
+		block->data = malloc(cmd_ctx->max_trace_block_sz);
+		if (!block->data) {
+			free(block);
+			command_print(cmd, "Failed to alloc trace buffer %" PRIu32 " bytes!", cmd_ctx->max_trace_block_sz);
+			esp32_apptrace_blocks_pool_cleanup(cmd_ctx);
+			return ERROR_FAIL;
+		}
+		INIT_LIST_HEAD(&block->node);
+		list_add(&block->node, &cmd_ctx->free_trace_blocks);
+	}
+
+	cmd_ctx->running = 1;
+	if (cmd_ctx->mode != ESP_APPTRACE_CMD_MODE_SYNC) {
+		int res = target_register_timer_callback(esp32_apptrace_data_processor,
+			0,
+			TARGET_TIMER_TYPE_PERIODIC,
+			cmd_ctx);
+		if (res != ERROR_OK) {
+			command_print(cmd, "Failed to start trace data timer callback (%d)!", res);
+			esp32_apptrace_blocks_pool_cleanup(cmd_ctx);
+			return ERROR_FAIL;
+		}
+	}
+
+	if (s_time_stats_enable) {
+		cmd_ctx->stats.min_blk_read_time = 1000000.0;
+		cmd_ctx->stats.min_blk_proc_time = 1000000.0;
+	}
+	if (duration_start(&cmd_ctx->idle_time) != 0) {
+		command_print(cmd, "Failed to start idle time measurement!");
+		esp32_apptrace_cmd_ctx_cleanup(cmd_ctx);
+		return ERROR_FAIL;
+	}
+
+	return ERROR_OK;
+}
+
+int esp32_apptrace_cmd_ctx_cleanup(struct esp32_apptrace_cmd_ctx *cmd_ctx)
+{
+	esp32_apptrace_blocks_pool_cleanup(cmd_ctx);
+	return ERROR_OK;
+}
+
+#define ESP32_APPTRACE_CMD_NUM_ARG_CHECK(_cmd_, _arg_, _start_, _end_)	   \
+	do { \
+		if ((_arg_) == 0 && (_start_) == (_end_)) { \
+			command_print(_cmd_, "Invalid '" # _arg_ "' arg!"); \
+			return;	\
+		} \
+	} while (0)
+
+void esp32_apptrace_cmd_args_parse(struct esp32_apptrace_cmd_ctx *cmd_ctx,
+	struct esp32_apptrace_cmd_data *cmd_data,
+	const char **argv,
+	int argc)
+{
+	char *end;
+
+	cmd_data->poll_period = strtoul(argv[0], &end, 10);
+	ESP32_APPTRACE_CMD_NUM_ARG_CHECK(cmd_ctx->cmd, cmd_data->poll_period, argv[0], end);
+	if (argc > 1) {
+		cmd_data->max_len = strtoul(argv[1], &end, 10);
+		ESP32_APPTRACE_CMD_NUM_ARG_CHECK(cmd_ctx->cmd, cmd_data->max_len, argv[1], end);
+		if (argc > 2) {
+			int32_t tmo = strtol(argv[2], &end, 10);
+			ESP32_APPTRACE_CMD_NUM_ARG_CHECK(cmd_ctx->cmd, tmo, argv[2], end);
+			cmd_ctx->stop_tmo = 1.0 * tmo;
+			if (argc > 3) {
+				cmd_data->wait4halt = strtoul(argv[3], &end, 10);
+				ESP32_APPTRACE_CMD_NUM_ARG_CHECK(cmd_ctx->cmd, cmd_data->wait4halt, argv[3], end);
+				if (argc > 4) {
+					cmd_data->skip_len = strtoul(argv[4], &end, 10);
+					ESP32_APPTRACE_CMD_NUM_ARG_CHECK(cmd_ctx->cmd, cmd_data->skip_len, argv[4], end);
+				}
+			}
+		}
+	}
+}
+
+static int esp32_apptrace_core_id_get(struct target *target, uint8_t *hdr_buf)
+{
+	return ESP32_APPTRACE_USER_BLOCK_CORE(target_buffer_get_u16(target, hdr_buf + APPTRACE_BLOCK_SIZE_OFFSET));
+}
+
+static uint32_t esp32_apptrace_usr_block_len_get(struct target *target, uint8_t *hdr_buf, uint32_t *wr_len)
+{
+	*wr_len = ESP32_APPTRACE_USER_BLOCK_LEN(target_buffer_get_u16(target, hdr_buf + APPTRACE_WR_SIZE_OFFSET));
+	return ESP32_APPTRACE_USER_BLOCK_LEN(target_buffer_get_u16(target, hdr_buf + APPTRACE_BLOCK_SIZE_OFFSET));
+}
+
+static int esp32_apptrace_cmd_init(struct esp32_apptrace_cmd_ctx *cmd_ctx,
+	struct command_invocation *cmd,
+	int mode,
+	const char **argv,
+	int argc)
+{
+	struct esp32_apptrace_cmd_data *cmd_data;
+
+	if (argc < 1) {
+		command_print(cmd, "Not enough args! Need trace data destination!");
+		return ERROR_FAIL;
+	}
+
+	int res = esp32_apptrace_cmd_ctx_init(cmd_ctx, cmd, mode);
+	if (res != ERROR_OK)
+		return res;
+
+	cmd_data = calloc(1, sizeof(*cmd_data));
+	assert(cmd_data && "No memory for command data!");
+	cmd_ctx->cmd_priv = cmd_data;
+
+	/*outfile1 [poll_period [trace_size [stop_tmo [wait4halt [skip_size]]]]] */
+	res = esp32_apptrace_dest_init(&cmd_data->data_dest, argv, 1);
+	if (res != 1) {	/* only one destination needs to be initialized */
+		command_print(cmd, "Wrong args! Needs a trace data destination!");
+		free(cmd_data);
+		goto on_error;
+	}
+	cmd_ctx->stop_tmo = -1.0;	/* infinite */
+	cmd_data->max_len = UINT32_MAX;
+	cmd_data->poll_period = 0 /*ms*/;
+	if (argc > 1)
+		/* parse remaining args */
+		esp32_apptrace_cmd_args_parse(cmd_ctx, cmd_data, &argv[1], argc - 1);
+
+	LOG_USER("App trace params: from %d cores, size %" PRId32 " bytes, stop_tmo %g s, poll period %" PRId32
+		" ms, wait_rst %d, skip %" PRId32 " bytes", cmd_ctx->cores_num,
+		cmd_data->max_len,
+		cmd_ctx->stop_tmo,
+		cmd_data->poll_period,
+		cmd_data->wait4halt,
+		cmd_data->skip_len);
+
+	cmd_ctx->trace_format.hdr_sz = ESP32_APPTRACE_USER_BLOCK_HDR_SZ;
+	cmd_ctx->trace_format.core_id_get = esp32_apptrace_core_id_get;
+	cmd_ctx->trace_format.usr_block_len_get = esp32_apptrace_usr_block_len_get;
+	return ERROR_OK;
+on_error:
+	command_print(cmd, "Not enough args! Need %d trace data destinations!", cmd_ctx->cores_num);
+	cmd_ctx->running = 0;
+	esp32_apptrace_cmd_ctx_cleanup(cmd_ctx);
+	return res;
+}
+
+static int esp32_apptrace_cmd_cleanup(struct esp32_apptrace_cmd_ctx *cmd_ctx)
+{
+	struct esp32_apptrace_cmd_data *cmd_data = cmd_ctx->cmd_priv;
+
+	esp32_apptrace_dest_cleanup(&cmd_data->data_dest, 1);
+	free(cmd_data);
+	cmd_ctx->cmd_priv = NULL;
+	esp32_apptrace_cmd_ctx_cleanup(cmd_ctx);
+	return ERROR_OK;
+}
+
+static void esp32_apptrace_print_stats(struct esp32_apptrace_cmd_ctx *ctx)
+{
+	struct esp32_apptrace_cmd_data *cmd_data = ctx->cmd_priv;
+	uint32_t trace_sz = 0;
+
+	if (cmd_data)
+		trace_sz = ctx->tot_len > cmd_data->skip_len ? ctx->tot_len - cmd_data->skip_len : 0;
+	LOG_USER("Tracing is %s. Size is %" PRId32 " of %" PRId32 " @ %f (%f) KiB/s",
+		!ctx->running ? "STOPPED" : "RUNNING",
+		trace_sz,
+		cmd_data ? cmd_data->max_len : 0,
+		duration_kbps(&ctx->read_time, ctx->tot_len),
+		duration_kbps(&ctx->read_time, ctx->raw_tot_len));
+	LOG_USER("Data: blocks incomplete %" PRId32 ", lost bytes: %" PRId32,
+		ctx->stats.incompl_blocks,
+		ctx->stats.lost_bytes);
+	if (s_time_stats_enable) {
+		LOG_USER("Block read time [%f..%f] ms",
+			1000 * ctx->stats.min_blk_read_time,
+			1000 * ctx->stats.max_blk_read_time);
+		LOG_USER("Block proc time [%f..%f] ms",
+			1000 * ctx->stats.min_blk_proc_time,
+			1000 * ctx->stats.max_blk_proc_time);
+	}
+}
+
+static int esp32_apptrace_wait4halt(struct esp32_apptrace_cmd_ctx *ctx, struct target *target)
+{
+	LOG_USER("Wait for halt...");
+	while (!openocd_is_shutdown_pending()) {
+		int res = target_poll(target);
+		if (res != ERROR_OK)
+			return res;
+		if (target->state == TARGET_HALTED) {
+			LOG_USER("%s: HALTED", target->cmd_name);
+			break;
+		}
+		alive_sleep(500);
+	}
+	return ERROR_OK;
+}
+
+int esp32_apptrace_safe_halt_targets(struct esp32_apptrace_cmd_ctx *ctx,
+	struct esp32_apptrace_target_state *targets)
+{
+	int res = ERROR_OK;
+
+	memset(targets, 0, ctx->cores_num * sizeof(struct esp32_apptrace_target_state));
+	/* halt all CPUs */
+	LOG_DEBUG("Halt all targets!");
+	for (unsigned int k = 0; k < ctx->cores_num; k++) {
+		if (!target_was_examined(ctx->cpus[k]))
+			continue;
+		if (ctx->cpus[k]->state == TARGET_HALTED)
+			continue;
+		res = target_halt(ctx->cpus[k]);
+		if (res != ERROR_OK) {
+			LOG_ERROR("Failed to halt target (%d)!", res);
+			return res;
+		}
+		res = target_wait_state(ctx->cpus[k], TARGET_HALTED, ESP32_APPTRACE_TGT_STATE_TMO);
+		if (res != ERROR_OK) {
+			LOG_ERROR("Failed to wait halt target %s / %d (%d)!",
+				target_name(ctx->cpus[k]),
+				ctx->cpus[k]->state,
+				res);
+			return res;
+		}
+	}
+	/* read current block statuses from CPUs */
+	LOG_DEBUG("Read current block statuses");
+	for (unsigned int k = 0; k < ctx->cores_num; k++) {
+		uint32_t stat;
+		res = ctx->hw->status_reg_read(ctx->cpus[k], &stat);
+		if (res != ERROR_OK) {
+			LOG_ERROR("Failed to read trace status (%d)!", res);
+			return res;
+		}
+		/* check if some CPU stopped inside tracing regs update critical section */
+		if (stat) {
+			if (ctx->hw->leave_trace_crit_section_start) {
+				res = ctx->hw->leave_trace_crit_section_start(ctx->cpus[k]);
+				if (res != ERROR_OK)
+					return res;
+			}
+			uint32_t bp_addr = stat;
+			res = breakpoint_add(ctx->cpus[k], bp_addr, 1, BKPT_HARD);
+			if (res != ERROR_OK) {
+				LOG_ERROR("Failed to set breakpoint (%d)!", res);
+				return res;
+			}
+			while (stat) {
+				/* allow this CPU to leave ERI write critical section */
+				res = target_resume(ctx->cpus[k], 1, 0, 1, 0);
+				if (res != ERROR_OK) {
+					LOG_ERROR("Failed to resume target (%d)!", res);
+					breakpoint_remove(ctx->cpus[k], bp_addr);
+					return res;
+				}
+				/* wait for CPU to be halted on BP */
+				enum target_debug_reason debug_reason = DBG_REASON_UNDEFINED;
+				while (debug_reason != DBG_REASON_BREAKPOINT) {
+					res = target_wait_state(ctx->cpus[k], TARGET_HALTED,
+						ESP32_APPTRACE_TGT_STATE_TMO);
+					if (res != ERROR_OK) {
+						LOG_ERROR("Failed to wait halt on bp (%d)!", res);
+						breakpoint_remove(ctx->cpus[k], bp_addr);
+						return res;
+					}
+					debug_reason = ctx->cpus[k]->debug_reason;
+				}
+				res = ctx->hw->status_reg_read(ctx->cpus[k], &stat);
+				if (res != ERROR_OK) {
+					LOG_ERROR("Failed to read trace status (%d)!", res);
+					breakpoint_remove(ctx->cpus[k], bp_addr);
+					return res;
+				}
+			}
+			breakpoint_remove(ctx->cpus[k], bp_addr);
+			if (ctx->hw->leave_trace_crit_section_stop) {
+				res = ctx->hw->leave_trace_crit_section_stop(ctx->cpus[k]);
+				if (res != ERROR_OK)
+					return res;
+			}
+		}
+		res = ctx->hw->data_len_read(ctx->cpus[k], &targets[k].block_id, &targets[k].data_len);
+		if (res != ERROR_OK) {
+			LOG_ERROR("Failed to read trace status (%d)!", res);
+			return res;
+		}
+	}
+
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_connect_targets(struct esp32_apptrace_cmd_ctx *ctx,
+	bool conn,
+	bool resume_target)
+{
+	struct esp32_apptrace_target_state target_to_connect[ESP32_APPTRACE_MAX_CORES_NUM];
+
+	if (conn)
+		LOG_USER("Connect targets...");
+	else
+		LOG_USER("Disconnect targets...");
+
+	int res = esp32_apptrace_safe_halt_targets(ctx, target_to_connect);
+	if (res != ERROR_OK) {
+		command_print(ctx->cmd, "Failed to halt targets (%d)!", res);
+		return res;
+	}
+	if (ctx->cores_num > 1) {
+		/* set block ids to the highest value */
+		uint32_t max_id = 0;
+		for (unsigned int k = 0; k < ctx->cores_num; k++) {
+			if (target_to_connect[k].block_id > max_id)
+				max_id = target_to_connect[k].block_id;
+		}
+		for (unsigned int k = 0; k < ctx->cores_num; k++)
+			target_to_connect[k].block_id = max_id;
+	}
+	for (unsigned int k = 0; k < ctx->cores_num; k++) {
+		/* update host connected status */
+		res = ctx->hw->ctrl_reg_write(ctx->cpus[k],
+			target_to_connect[k].block_id,
+			0 /*ack target data*/,
+			conn,
+			false /*no host data*/);
+		if (res != ERROR_OK) {
+			command_print(ctx->cmd, "Failed to read trace status (%d)!", res);
+			return res;
+		}
+	}
+	if (resume_target) {
+		LOG_DEBUG("Resume targets");
+		bool smp_resumed = false;
+		for (unsigned int k = 0; k < ctx->cores_num; k++) {
+			if (smp_resumed && ctx->cpus[k]->smp) {
+				/* in SMP mode we need to call target_resume for one core only */
+				continue;
+			}
+			res = target_resume(ctx->cpus[k], 1, 0, 1, 0);
+			if (res != ERROR_OK) {
+				command_print(ctx->cmd, "Failed to resume target (%d)!", res);
+				return res;
+			}
+			if (ctx->cpus[k]->smp)
+				smp_resumed = true;
+		}
+	}
+	if (conn)
+		LOG_INFO("Targets connected.");
+	else
+		LOG_INFO("Targets disconnected.");
+	return ERROR_OK;
+}
+
+int esp_apptrace_usr_block_write(const struct esp32_apptrace_hw *hw, struct target *target,
+	uint32_t block_id,
+	const uint8_t *data,
+	uint32_t size)
+{
+	struct esp_apptrace_host2target_hdr hdr = { .block_sz = size };
+	uint32_t buf_sz[2] = { sizeof(hdr), size };
+	const uint8_t *bufs[2] = { (const uint8_t *)&hdr, data };
+
+	if (size > hw->usr_block_max_size_get(target)) {
+		LOG_ERROR("Too large user block %" PRId32, size);
+		return ERROR_FAIL;
+	}
+
+	return hw->buffs_write(target,
+		ARRAY_SIZE(buf_sz),
+		buf_sz,
+		bufs,
+		block_id,
+		true /*ack target data*/,
+		true /*host data*/);
+}
+
+static uint32_t esp32_apptrace_usr_block_check(struct esp32_apptrace_cmd_ctx *ctx, uint8_t *hdr_buf)
+{
+	uint32_t wr_len = 0;
+	uint32_t usr_len = ctx->trace_format.usr_block_len_get(ctx->target, hdr_buf, &wr_len);
+	if (usr_len != wr_len) {
+		LOG_ERROR("Incomplete block sz %" PRId32 ", wr %" PRId32, usr_len, wr_len);
+		ctx->stats.incompl_blocks++;
+		ctx->stats.lost_bytes += usr_len - wr_len;
+	}
+	return usr_len;
+}
+
+int esp32_apptrace_get_data_info(struct esp32_apptrace_cmd_ctx *ctx,
+	struct esp32_apptrace_target_state *target_state,
+	uint32_t *fired_target_num)
+{
+	if (fired_target_num)
+		*fired_target_num = UINT32_MAX;
+
+	for (unsigned int i = 0; i < ctx->cores_num; i++) {
+		int res = ctx->hw->data_len_read(ctx->cpus[i], &target_state[i].block_id, &target_state[i].data_len);
+		if (res != ERROR_OK) {
+			LOG_ERROR("Failed to read data len on (%s)!", target_name(ctx->cpus[i]));
+			return res;
+		}
+		if (target_state[i].data_len) {
+			LOG_TARGET_DEBUG(ctx->cpus[i], "Block %" PRId32 ", len %" PRId32 " bytes on fired",
+				target_state[i].block_id, target_state[i].data_len);
+			if (fired_target_num)
+				*fired_target_num = i;
+			break;
+		}
+	}
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_process_data(struct esp32_apptrace_cmd_ctx *ctx,
+	unsigned int core_id,
+	uint8_t *data,
+	uint32_t data_len)
+{
+	struct esp32_apptrace_cmd_data *cmd_data = ctx->cmd_priv;
+
+	LOG_DEBUG("Got block %" PRId32 " bytes [%x %x...%x %x]", data_len, data[12], data[13],
+		data[data_len - 2], data[data_len - 1]);
+	if (ctx->tot_len + data_len > cmd_data->skip_len) {
+		uint32_t wr_idx = 0, wr_chunk_len = data_len;
+		if (ctx->tot_len < cmd_data->skip_len) {
+			wr_chunk_len = (ctx->tot_len + wr_chunk_len) - cmd_data->skip_len;
+			wr_idx = cmd_data->skip_len - ctx->tot_len;
+		}
+		if (ctx->tot_len + wr_chunk_len > cmd_data->max_len)
+			wr_chunk_len -= (ctx->tot_len + wr_chunk_len - cmd_data->skip_len) - cmd_data->max_len;
+		if (wr_chunk_len > 0) {
+			int res = cmd_data->data_dest.write(cmd_data->data_dest.priv, data + wr_idx, wr_chunk_len);
+			if (res != ERROR_OK) {
+				LOG_ERROR("Failed to write %" PRId32 " bytes to dest 0!", data_len);
+				return res;
+			}
+		}
+		ctx->tot_len += wr_chunk_len;
+	} else {
+		ctx->tot_len += data_len;
+	}
+
+	if (cmd_data->data_dest.log_progress)
+		LOG_USER("%" PRId32 " ", ctx->tot_len);
+	/* check for stop condition */
+	if (ctx->tot_len > cmd_data->skip_len && (ctx->tot_len - cmd_data->skip_len >= cmd_data->max_len)) {
+		ctx->running = 0;
+		if (duration_measure(&ctx->read_time) != 0) {
+			LOG_ERROR("Failed to stop trace read time measure!");
+			return ERROR_FAIL;
+		}
+	}
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_handle_trace_block(struct esp32_apptrace_cmd_ctx *ctx,
+	struct esp32_apptrace_block *block)
+{
+	uint32_t processed = 0;
+	uint32_t hdr_sz = ctx->trace_format.hdr_sz;
+
+	LOG_DEBUG("Got block %" PRId32 " bytes", block->data_len);
+	/* process user blocks one by one */
+	while (processed < block->data_len) {
+		LOG_DEBUG("Process usr block %" PRId32 "/%" PRId32, processed, block->data_len);
+		/* process user block */
+		uint32_t usr_len = esp32_apptrace_usr_block_check(ctx, block->data + processed);
+		int core_id = ctx->trace_format.core_id_get(ctx->target, block->data + processed);
+		/* process user data */
+		int res = ctx->process_data(ctx, core_id, block->data + processed + hdr_sz, usr_len);
+		if (res != ERROR_OK) {
+			LOG_ERROR("Failed to process %" PRId32 " bytes!", usr_len);
+			return res;
+		}
+		processed += usr_len + hdr_sz;
+	}
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_data_processor(void *priv)
+{
+	struct esp32_apptrace_cmd_ctx *ctx = (struct esp32_apptrace_cmd_ctx *)priv;
+
+	if (!ctx->running)
+		return ERROR_OK;
+
+	struct esp32_apptrace_block *block = esp32_apptrace_ready_block_get(ctx);
+	if (!block)
+		return ERROR_OK;
+
+	int res = esp32_apptrace_handle_trace_block(ctx, block);
+	if (res != ERROR_OK) {
+		ctx->running = 0;
+		LOG_ERROR("Failed to process trace block %" PRId32 " bytes!", block->data_len);
+		return res;
+	}
+	res = esp32_apptrace_block_free(ctx, block);
+	if (res != ERROR_OK) {
+		ctx->running = 0;
+		LOG_ERROR("Failed to free ready block!");
+		return res;
+	}
+
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_check_connection(struct esp32_apptrace_cmd_ctx *ctx)
+{
+	if (!ctx)
+		return ERROR_FAIL;
+
+	unsigned int busy_target_num = 0;
+
+	for (unsigned int i = 0; i < ctx->cores_num; i++) {
+		bool conn = true;
+		int res = ctx->hw->ctrl_reg_read(ctx->cpus[i], NULL, NULL, &conn);
+		if (res != ERROR_OK) {
+			LOG_ERROR("Failed to read apptrace control reg for cpu(%d) res(%d)!", i, res);
+			return res;
+		}
+		if (!conn) {
+			uint32_t stat = 0;
+			LOG_TARGET_WARNING(ctx->cpus[i], "apptrace connection is lost. Re-connect.");
+			res = ctx->hw->status_reg_read(ctx->cpus[i], &stat);
+			if (res != ERROR_OK) {
+				LOG_ERROR("Failed to read trace status (%d)!", res);
+				return res;
+			}
+			if (stat) {
+				LOG_TARGET_WARNING(ctx->cpus[i], "in critical state. Retry in next poll");
+				if (++busy_target_num == ctx->cores_num) {
+					LOG_WARNING("No available core");
+					return ERROR_WAIT;
+				}
+				continue;
+			}
+			res = ctx->hw->ctrl_reg_write(ctx->cpus[i],
+				0,
+				0,
+				true /*host connected*/,
+				false /*no host data*/);
+			if (res != ERROR_OK) {
+				LOG_ERROR("Failed to write apptrace control reg for cpu(%d) res(%d)!", i, res);
+				return res;
+			}
+			if (ctx->stop_tmo != -1.0) {
+				/* re-start idle time measurement */
+				if (duration_start(&ctx->idle_time) != 0) {
+					LOG_ERROR("Failed to re-start idle time measure!");
+					return ERROR_FAIL;
+				}
+			}
+		}
+	}
+
+	return ERROR_OK;
+}
+
+static int esp32_apptrace_poll(void *priv)
+{
+	struct esp32_apptrace_cmd_ctx *ctx = (struct esp32_apptrace_cmd_ctx *)priv;
+	int res;
+	uint32_t fired_target_num = 0;
+	struct esp32_apptrace_target_state target_state[ESP32_APPTRACE_MAX_CORES_NUM];
+	struct duration blk_proc_time;
+
+	if (!ctx->running) {
+		if (ctx->auto_clean)
+			ctx->auto_clean(ctx);
+		return ERROR_FAIL;
+	}
+
+	/*  Check for connection is alive.For some reason target and therefore host_connected flag
+	 *  might have been reset */
+	res = esp32_apptrace_check_connection(ctx);
+	if (res != ERROR_OK) {
+		if (res != ERROR_WAIT)
+			ctx->running = 0;
+		return res;
+	}
+
+	/* check for data from target */
+	res = esp32_apptrace_get_data_info(ctx, target_state, &fired_target_num);
+	if (res != ERROR_OK) {
+		ctx->running = 0;
+		LOG_ERROR("Failed to read data len!");
+		return res;
+	}
+	/* LOG_DEBUG("Block %d (%d bytes) on target (%s)!", target_state[0].block_id,
+	 * target_state[0].data_len, target_name(ctx->cpus[0])); */
+	if (fired_target_num == UINT32_MAX) {
+		/* no data has been received, but block could be switched due to the data transferred
+		 * from host to target */
+		if (ctx->cores_num > 1) {
+			uint32_t max_block_id = 0, min_block_id = ctx->hw->max_block_id;
+			/* find maximum block ID and set the same ID in control reg for both cores
+			 * */
+			for (unsigned int i = 0; i < ctx->cores_num; i++) {
+				if (max_block_id < target_state[i].block_id)
+					max_block_id = target_state[i].block_id;
+				if (min_block_id > target_state[i].block_id)
+					min_block_id = target_state[i].block_id;
+			}
+			/* handle block ID overflow */
+			if (max_block_id == ctx->hw->max_block_id && min_block_id == 0)
+				max_block_id = 0;
+			for (unsigned int i = 0; i < ctx->cores_num; i++) {
+				if (max_block_id != target_state[i].block_id) {
+					LOG_TARGET_DEBUG(ctx->cpus[i], "Ack empty block %" PRId32 "!", max_block_id);
+					res = ctx->hw->ctrl_reg_write(ctx->cpus[i],
+						max_block_id,
+						0 /*all read*/,
+						true /*host connected*/,
+						false /*no host data*/);
+					if (res != ERROR_OK) {
+						ctx->running = 0;
+						LOG_TARGET_ERROR(ctx->cpus[i], "Failed to ack empty data block!");
+						return res;
+					}
+				}
+			}
+			ctx->last_blk_id = max_block_id;
+		}
+		if (ctx->stop_tmo != -1.0) {
+			if (duration_measure(&ctx->idle_time) != 0) {
+				ctx->running = 0;
+				LOG_ERROR("Failed to measure idle time!");
+				return ERROR_FAIL;
+			}
+			if (duration_elapsed(&ctx->idle_time) >= ctx->stop_tmo) {
+				ctx->running = 0;
+				LOG_ERROR("Data timeout!");
+				return ERROR_FAIL;
+			}
+		}
+		return ERROR_OK;/* no data */
+	}
+	/* sanity check */
+	if (target_state[fired_target_num].data_len > ctx->max_trace_block_sz) {
+		ctx->running = 0;
+		LOG_ERROR("Too large block size %" PRId32 "!", target_state[fired_target_num].data_len);
+		return ERROR_FAIL;
+	}
+	if (ctx->tot_len == 0) {
+		if (duration_start(&ctx->read_time) != 0) {
+			ctx->running = 0;
+			LOG_ERROR("Failed to start trace read time measurement!");
+			return ERROR_FAIL;
+		}
+	}
+	struct esp32_apptrace_block *block = esp32_apptrace_free_block_get(ctx);
+	if (!block) {
+		ctx->running = 0;
+		LOG_TARGET_ERROR(ctx->cpus[fired_target_num], "Failed to get free block for data!");
+		return ERROR_FAIL;
+	}
+	if (s_time_stats_enable) {
+		/* read block */
+		if (duration_start(&blk_proc_time) != 0) {
+			ctx->running = 0;
+			LOG_ERROR("Failed to start block read time measurement!");
+			return ERROR_FAIL;
+		}
+	}
+	res =
+		ctx->hw->data_read(ctx->cpus[fired_target_num],
+		target_state[fired_target_num].data_len,
+		block->data,
+		target_state[fired_target_num].block_id,
+		/* do not ack target data in sync mode,
+		   esp32_apptrace_handle_trace_block() can write response data and will do ack thereafter */
+		ctx->mode != ESP_APPTRACE_CMD_MODE_SYNC);
+	if (res != ERROR_OK) {
+		ctx->running = 0;
+		LOG_TARGET_ERROR(ctx->cpus[fired_target_num], "Failed to read data!");
+		return res;
+	}
+	ctx->last_blk_id = target_state[fired_target_num].block_id;
+	block->data_len = target_state[fired_target_num].data_len;
+	ctx->raw_tot_len += block->data_len;
+	if (s_time_stats_enable) {
+		if (duration_measure(&blk_proc_time) != 0) {
+			ctx->running = 0;
+			LOG_ERROR("Failed to measure block read time!");
+			return ERROR_FAIL;
+		}
+		/* update stats */
+		float brt = duration_elapsed(&blk_proc_time);
+		if (brt > ctx->stats.max_blk_read_time)
+			ctx->stats.max_blk_read_time = brt;
+		if (brt < ctx->stats.min_blk_read_time)
+			ctx->stats.min_blk_read_time = brt;
+
+		if (duration_start(&blk_proc_time) != 0) {
+			ctx->running = 0;
+			LOG_ERROR("Failed to start block proc time measurement!");
+			return ERROR_FAIL;
+		}
+	}
+	/* in sync mode do not ack target data on other cores, esp32_apptrace_handle_trace_block() can write response
+	 * data and will do ack thereafter */
+	if (ctx->mode != ESP_APPTRACE_CMD_MODE_SYNC) {
+		for (unsigned int i = 0; i < ctx->cores_num; i++) {
+			if (i == fired_target_num)
+				continue;
+			res = ctx->hw->ctrl_reg_write(ctx->cpus[i],
+				ctx->last_blk_id,
+				0 /*all read*/,
+				true /*host connected*/,
+				false /*no host data*/);
+			if (res != ERROR_OK) {
+				ctx->running = 0;
+				LOG_TARGET_ERROR(ctx->cpus[i], "Failed to ack data!");
+				return res;
+			}
+			LOG_TARGET_DEBUG(ctx->cpus[i], "Ack block %" PRId32, ctx->last_blk_id);
+		}
+		res = esp32_apptrace_ready_block_put(ctx, block);
+		if (res != ERROR_OK) {
+			ctx->running = 0;
+			LOG_TARGET_ERROR(ctx->cpus[fired_target_num], "Failed to put ready block of data!");
+			return res;
+		}
+	} else {
+		res = esp32_apptrace_handle_trace_block(ctx, block);
+		if (res != ERROR_OK) {
+			ctx->running = 0;
+			LOG_ERROR("Failed to process trace block %" PRId32 " bytes!", block->data_len);
+			return res;
+		}
+		res = esp32_apptrace_block_free(ctx, block);
+		if (res != ERROR_OK) {
+			ctx->running = 0;
+			LOG_ERROR("Failed to free ready block!");
+			return res;
+		}
+	}
+	if (ctx->stop_tmo != -1.0) {
+		/* start idle time measurement */
+		if (duration_start(&ctx->idle_time) != 0) {
+			ctx->running = 0;
+			LOG_ERROR("Failed to start idle time measure!");
+			return ERROR_FAIL;
+		}
+	}
+	if (s_time_stats_enable) {
+		if (duration_measure(&blk_proc_time) != 0) {
+			ctx->running = 0;
+			LOG_ERROR("Failed to stop block proc time measure!");
+			return ERROR_FAIL;
+		}
+		/* update stats */
+		float bt = duration_elapsed(&blk_proc_time);
+		if (bt > ctx->stats.max_blk_proc_time)
+			ctx->stats.max_blk_proc_time = bt;
+		if (bt < ctx->stats.min_blk_proc_time)
+			ctx->stats.min_blk_proc_time = bt;
+	}
+	return ERROR_OK;
+}
+
+static void esp32_apptrace_cmd_stop(struct esp32_apptrace_cmd_ctx *ctx)
+{
+	if (duration_measure(&ctx->read_time) != 0)
+		LOG_ERROR("Failed to stop trace read time measurement!");
+	int res = target_unregister_timer_callback(esp32_apptrace_poll, ctx);
+	if (res != ERROR_OK)
+		LOG_ERROR("Failed to unregister target timer handler (%d)!", res);
+
+	/* data processor is alive, so wait for all received blocks to be processed */
+	res = esp32_apptrace_wait_tracing_finished(ctx);
+	if (res != ERROR_OK)
+		LOG_ERROR("Failed to wait for pended blocks (%d)!", res);
+	res = esp32_apptrace_connect_targets(ctx, false, ctx->target_state == TARGET_RUNNING);
+	if (res != ERROR_OK)
+		LOG_ERROR("Failed to disconnect targets (%d)!", res);
+	esp32_apptrace_print_stats(ctx);
+	res = esp32_apptrace_cmd_cleanup(ctx);
+	if (res != ERROR_OK)
+		LOG_ERROR("Failed to cleanup cmd ctx (%d)!", res);
+}
+
+int esp32_cmd_apptrace_generic(struct command_invocation *cmd, int mode, const char **argv, int argc)
+{
+	static struct esp32_apptrace_cmd_ctx s_at_cmd_ctx;
+	struct esp32_apptrace_cmd_data *cmd_data;
+	int res = ERROR_FAIL;
+	enum target_state old_state;
+	struct target *target = get_current_target(CMD_CTX);
+
+	if (argc < 1)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	/* command can be invoked on unexamined core, if so find examined one */
+	if (target->smp && !target_was_examined(target)) {
+		struct target_list *head;
+		struct target *curr;
+		LOG_WARNING("Current target '%s' was not examined!", target_name(target));
+		foreach_smp_target(head, target->smp_targets) {
+			curr = head->target;
+			if (target_was_examined(curr)) {
+				target = curr;
+				LOG_WARNING("Run command on target '%s'", target_name(target));
+				break;
+			}
+		}
+	}
+	old_state = target->state;
+
+	if (strcmp(argv[0], "start") == 0) {
+		res = esp32_apptrace_cmd_init(&s_at_cmd_ctx,
+			cmd,
+			mode,
+			&argv[1],
+			argc - 1);
+		if (res != ERROR_OK) {
+			command_print(cmd, "Failed to init cmd ctx (%d)!", res);
+			return res;
+		}
+		cmd_data = s_at_cmd_ctx.cmd_priv;
+		s_at_cmd_ctx.process_data = esp32_apptrace_process_data;
+		s_at_cmd_ctx.auto_clean = esp32_apptrace_cmd_stop;
+		if (cmd_data->wait4halt) {
+			res = esp32_apptrace_wait4halt(&s_at_cmd_ctx, target);
+			if (res != ERROR_OK) {
+				command_print(cmd, "Failed to wait for halt target (%d)!", res);
+				goto _on_start_error;
+			}
+		}
+		res = esp32_apptrace_connect_targets(&s_at_cmd_ctx, true, old_state == TARGET_RUNNING);
+		if (res != ERROR_OK) {
+			command_print(cmd, "Failed to connect to targets (%d)!", res);
+			goto _on_start_error;
+		}
+		res = target_register_timer_callback(esp32_apptrace_poll,
+			cmd_data->poll_period,
+			TARGET_TIMER_TYPE_PERIODIC,
+			&s_at_cmd_ctx);
+		if (res != ERROR_OK) {
+			command_print(cmd, "Failed to register target timer handler (%d)!", res);
+			goto _on_start_error;
+		}
+	} else if (strcmp(argv[0], "stop") == 0) {
+		if (!s_at_cmd_ctx.running) {
+			command_print(cmd, "Tracing is not running!");
+			return ERROR_FAIL;
+		}
+		esp32_apptrace_cmd_stop(&s_at_cmd_ctx);
+		return ERROR_OK;
+	} else if (strcmp(argv[0], "status") == 0) {
+		if (s_at_cmd_ctx.running && duration_measure(&s_at_cmd_ctx.read_time) != 0)
+			LOG_ERROR("Failed to measure trace read time!");
+		esp32_apptrace_print_stats(&s_at_cmd_ctx);
+		return ERROR_OK;
+	} else if (strcmp(argv[0], "dump") == 0) {
+		/* [dump outfile] - post-mortem dump without connection to targets */
+		res = esp32_apptrace_cmd_init(&s_at_cmd_ctx,
+			cmd,
+			mode,
+			&argv[1],
+			argc - 1);
+		if (res != ERROR_OK) {
+			command_print(cmd, "Failed to init cmd ctx (%d)!", res);
+			return res;
+		}
+		s_at_cmd_ctx.stop_tmo = 0.01;	/* use small stop tmo */
+		s_at_cmd_ctx.process_data = esp32_apptrace_process_data;
+		/* check for exit signal and command completion */
+		while (!openocd_is_shutdown_pending() && s_at_cmd_ctx.running) {
+			res = esp32_apptrace_poll(&s_at_cmd_ctx);
+			if (res != ERROR_OK) {
+				LOG_ERROR("Failed to poll target for trace data (%d)!", res);
+				break;
+			}
+			/* let registered timer callbacks to run */
+			target_call_timer_callbacks();
+		}
+		if (s_at_cmd_ctx.running) {
+			/* data processor is alive, so wait for all received blocks to be processed */
+			res = esp32_apptrace_wait_tracing_finished(&s_at_cmd_ctx);
+			if (res != ERROR_OK)
+				LOG_ERROR("Failed to wait for pended blocks (%d)!", res);
+		}
+		esp32_apptrace_print_stats(&s_at_cmd_ctx);
+		res = esp32_apptrace_cmd_cleanup(&s_at_cmd_ctx);
+		if (res != ERROR_OK)
+			command_print(cmd, "Failed to cleanup cmd ctx (%d)!", res);
+	} else {
+		command_print(cmd, "Invalid action '%s'!", argv[0]);
+	}
+
+	return res;
+
+_on_start_error:
+	s_at_cmd_ctx.running = 0;
+	esp32_apptrace_cmd_cleanup(&s_at_cmd_ctx);
+	return res;
+}
+
+COMMAND_HANDLER(esp32_cmd_apptrace)
+{
+	return esp32_cmd_apptrace_generic(CMD, ESP_APPTRACE_CMD_MODE_GEN, CMD_ARGV, CMD_ARGC);
+}
+
+const struct command_registration esp32_apptrace_command_handlers[] = {
+	{
+		.name = "apptrace",
+		.handler = esp32_cmd_apptrace,
+		.mode = COMMAND_EXEC,
+		.help =
+			"App Tracing: application level trace control. Starts, stops or queries tracing process status.",
+		.usage =
+			"[start <destination> [poll_period [trace_size [stop_tmo [wait4halt [skip_size]]]]] | [stop] | [status] | [dump <destination>]",
+	},
+	COMMAND_REGISTRATION_DONE
+};
diff --git a/src/target/espressif/esp32_apptrace.h b/src/target/espressif/esp32_apptrace.h
new file mode 100644
index 000000000..387334222
--- /dev/null
+++ b/src/target/espressif/esp32_apptrace.h
@@ -0,0 +1,126 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+/***************************************************************************
+ *   ESP32 application trace module                                        *
+ *   Copyright (C) 2017-2019 Espressif Systems Ltd.                        *
+ ***************************************************************************/
+
+#ifndef OPENOCD_TARGET_ESP32_APPTRACE_H
+#define OPENOCD_TARGET_ESP32_APPTRACE_H
+
+#include <helper/command.h>
+#include <helper/time_support.h>
+#include <target/target.h>
+
+#define ESP32_APPTRACE_MAX_CORES_NUM 2
+
+struct esp32_apptrace_hw {
+	uint32_t max_block_id;
+	uint32_t (*max_block_size_get)(struct target *target);
+	int (*status_reg_read)(struct target *target, uint32_t *stat);
+	int (*ctrl_reg_write)(struct target *target,
+		uint32_t block_id,
+		uint32_t len,
+		bool conn,
+		bool data);
+	int (*ctrl_reg_read)(struct target *target,
+		uint32_t *block_id,
+		uint32_t *len,
+		bool *conn);
+	int (*data_len_read)(struct target *target,
+		uint32_t *block_id,
+		uint32_t *len);
+	int (*data_read)(struct target *target,
+		uint32_t size,
+		uint8_t *buffer,
+		uint32_t block_id,
+		bool ack);
+	uint32_t (*usr_block_max_size_get)(struct target *target);
+	int (*buffs_write)(struct target *target,
+		uint32_t bufs_num,
+		uint32_t buf_sz[],
+		const uint8_t *bufs[],
+		uint32_t block_id,
+		bool ack,
+		bool data);
+	int (*leave_trace_crit_section_start)(struct target *target);
+	int (*leave_trace_crit_section_stop)(struct target *target);
+};
+
+struct esp_apptrace_host2target_hdr {
+	uint16_t block_sz;
+};
+
+struct esp32_apptrace_dest {
+	void *priv;
+	int (*write)(void *priv, uint8_t *data, int size);
+	int (*clean)(void *priv);
+	bool log_progress;
+};
+
+struct esp32_apptrace_format {
+	uint32_t hdr_sz;
+	int (*core_id_get)(struct target *target, uint8_t *hdr_buf);
+	uint32_t (*usr_block_len_get)(struct target *target, uint8_t *hdr_buf, uint32_t *wr_len);
+};
+
+struct esp32_apptrace_cmd_stats {
+	uint32_t incompl_blocks;
+	uint32_t lost_bytes;
+	float min_blk_read_time;
+	float max_blk_read_time;
+	float min_blk_proc_time;
+	float max_blk_proc_time;
+};
+
+struct esp32_apptrace_cmd_ctx {
+	volatile int running;
+	int mode;
+	/* TODO: use subtargets from target arch info */
+	struct target *cpus[ESP32_APPTRACE_MAX_CORES_NUM];
+	/* TODO: use cores num from target */
+	unsigned int cores_num;
+	const struct esp32_apptrace_hw *hw;
+	enum target_state target_state;
+	uint32_t last_blk_id;
+	struct list_head free_trace_blocks;
+	struct list_head ready_trace_blocks;
+	uint32_t max_trace_block_sz;
+	struct esp32_apptrace_format trace_format;
+	int (*process_data)(struct esp32_apptrace_cmd_ctx *ctx, unsigned int core_id, uint8_t *data, uint32_t data_len);
+	void (*auto_clean)(struct esp32_apptrace_cmd_ctx *ctx);
+	uint32_t tot_len;
+	uint32_t raw_tot_len;
+	float stop_tmo;
+	struct esp32_apptrace_cmd_stats stats;
+	struct duration read_time;
+	struct duration idle_time;
+	void *cmd_priv;
+	struct target *target;
+	struct command_invocation *cmd;
+};
+
+struct esp32_apptrace_cmd_data {
+	struct esp32_apptrace_dest data_dest;
+	uint32_t poll_period;
+	uint32_t max_len;
+	uint32_t skip_len;
+	bool wait4halt;
+};
+
+int esp32_apptrace_cmd_ctx_init(struct esp32_apptrace_cmd_ctx *cmd_ctx, struct command_invocation *cmd, int mode);
+int esp32_apptrace_cmd_ctx_cleanup(struct esp32_apptrace_cmd_ctx *cmd_ctx);
+void esp32_apptrace_cmd_args_parse(struct esp32_apptrace_cmd_ctx *cmd_ctx,
+	struct esp32_apptrace_cmd_data *cmd_data,
+	const char **argv,
+	int argc);
+int esp32_apptrace_dest_init(struct esp32_apptrace_dest dest[], const char *dest_paths[], unsigned int max_dests);
+int esp32_apptrace_dest_cleanup(struct esp32_apptrace_dest dest[], unsigned int max_dests);
+int esp_apptrace_usr_block_write(const struct esp32_apptrace_hw *hw, struct target *target,
+	uint32_t block_id,
+	const uint8_t *data,
+	uint32_t size);
+
+extern const struct command_registration esp32_apptrace_command_handlers[];
+
+#endif	/* OPENOCD_TARGET_ESP32_APPTRACE_H */
diff --git a/src/target/espressif/esp32s2.c b/src/target/espressif/esp32s2.c
index 64fa69057..a11d05f0f 100644
--- a/src/target/espressif/esp32s2.c
+++ b/src/target/espressif/esp32s2.c
@@ -496,6 +496,11 @@ static const struct command_registration esp32s2_command_handlers[] = {
 	{
 		.chain = xtensa_command_handlers,
 	},
+	{
+		.name = "esp",
+		.usage = "",
+		.chain = esp32_apptrace_command_handlers,
+	},
 	{
 		.name = "arm",
 		.mode = COMMAND_ANY,
diff --git a/src/target/espressif/esp32s3.c b/src/target/espressif/esp32s3.c
index 62b22b135..485567836 100644
--- a/src/target/espressif/esp32s3.c
+++ b/src/target/espressif/esp32s3.c
@@ -364,6 +364,11 @@ static const struct command_registration esp32s3_command_handlers[] = {
 		.usage = "",
 		.chain = esp_xtensa_smp_command_handlers,
 	},
+	{
+		.name = "esp",
+		.usage = "",
+		.chain = esp32_apptrace_command_handlers,
+	},
 	{
 		.name = "esp32",
 		.usage = "",
diff --git a/src/target/espressif/esp_xtensa.c b/src/target/espressif/esp_xtensa.c
index fcc340c82..44764aeca 100644
--- a/src/target/espressif/esp_xtensa.c
+++ b/src/target/espressif/esp_xtensa.c
@@ -12,6 +12,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <target/smp.h>
+#include "esp_xtensa_apptrace.h"
 #include <target/register.h>
 #include "esp_xtensa.h"
 #include "esp_semihosting.h"
@@ -25,6 +26,7 @@ int esp_xtensa_init_arch_info(struct target *target,
 	if (ret != ERROR_OK)
 		return ret;
 	esp_xtensa->semihost.ops = (struct esp_semihost_ops *)semihost_ops;
+	esp_xtensa->apptrace.hw = &esp_xtensa_apptrace_hw;
 	return ERROR_OK;
 }
 
diff --git a/src/target/espressif/esp_xtensa.h b/src/target/espressif/esp_xtensa.h
index 1ad6c377f..8807f0c32 100644
--- a/src/target/espressif/esp_xtensa.h
+++ b/src/target/espressif/esp_xtensa.h
@@ -12,10 +12,12 @@
 #include <target/xtensa/xtensa.h>
 #include "esp_xtensa.h"
 #include "esp_semihosting.h"
+#include "esp_xtensa_apptrace.h"
 
 struct esp_xtensa_common {
 	struct xtensa xtensa;	/* must be the first element */
 	struct esp_semihost_data semihost;
+	struct esp_xtensa_apptrace_info apptrace;
 };
 
 static inline struct esp_xtensa_common *target_to_esp_xtensa(struct target *target)
diff --git a/src/target/espressif/esp_xtensa_apptrace.c b/src/target/espressif/esp_xtensa_apptrace.c
new file mode 100644
index 000000000..dfb846da0
--- /dev/null
+++ b/src/target/espressif/esp_xtensa_apptrace.c
@@ -0,0 +1,497 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+/***************************************************************************
+ *   Xtensa application tracing module for OpenOCD                         *
+ *   Copyright (C) 2017 Espressif Systems Ltd.                             *
+ ***************************************************************************/
+
+/*
+    How it works?
+    https://github.com/espressif/esp-idf/blob/master/components/app_trace/port/xtensa/port.c#L8
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <helper/align.h>
+#include <target/xtensa/xtensa.h>
+#include <target/xtensa/xtensa_debug_module.h>
+#include "esp_xtensa_apptrace.h"
+
+/* TRAX is disabled, so we use its registers for our own purposes
+ * | 31..XXXXXX..24 | 23 .(host_connect). 23 | 22 .(host_data). 22| 21..(block_id)..15 | 14..(block_len)..0 |
+ */
+#define XTENSA_APPTRACE_CTRL_REG                XDMREG_DELAYCNT
+#define XTENSA_APPTRACE_BLOCK_ID_MSK            0x7FUL
+#define XTENSA_APPTRACE_BLOCK_ID_MAX            XTENSA_APPTRACE_BLOCK_ID_MSK
+/* if non-zero then apptrace code entered the critical section and the value is an address of the
+ * critical section's exit point */
+#define XTENSA_APPTRACE_STAT_REG                XDMREG_TRIGGERPC
+
+#define XTENSA_APPTRACE_BLOCK_LEN_MSK           0x7FFFUL
+#define XTENSA_APPTRACE_BLOCK_LEN(_l_)          ((_l_) & XTENSA_APPTRACE_BLOCK_LEN_MSK)
+#define XTENSA_APPTRACE_BLOCK_LEN_GET(_v_)      ((_v_) & XTENSA_APPTRACE_BLOCK_LEN_MSK)
+#define XTENSA_APPTRACE_BLOCK_ID(_id_)          (((_id_) & XTENSA_APPTRACE_BLOCK_ID_MSK) << 15)
+#define XTENSA_APPTRACE_BLOCK_ID_GET(_v_)       (((_v_) >> 15) & XTENSA_APPTRACE_BLOCK_ID_MSK)
+#define XTENSA_APPTRACE_HOST_DATA               BIT(22)
+#define XTENSA_APPTRACE_HOST_CONNECT            BIT(23)
+
+static int esp_xtensa_apptrace_leave_crit_section_start(struct target *target);
+static int esp_xtensa_apptrace_leave_crit_section_stop(struct target *target);
+static int esp_xtensa_apptrace_buffs_write(struct target *target,
+	uint32_t bufs_num,
+	uint32_t buf_sz[],
+	const uint8_t *bufs[],
+	uint32_t block_id,
+	bool ack,
+	bool data);
+
+struct esp32_apptrace_hw esp_xtensa_apptrace_hw = {
+	.max_block_id = XTENSA_APPTRACE_BLOCK_ID_MAX,
+	.max_block_size_get = esp_xtensa_apptrace_block_max_size_get,
+	.status_reg_read = esp_xtensa_apptrace_status_reg_read,
+	.ctrl_reg_write = esp_xtensa_apptrace_ctrl_reg_write,
+	.ctrl_reg_read = esp_xtensa_apptrace_ctrl_reg_read,
+	.data_len_read = esp_xtensa_apptrace_data_len_read,
+	.data_read = esp_xtensa_apptrace_data_read,
+	.usr_block_max_size_get = esp_xtensa_apptrace_usr_block_max_size_get,
+	.buffs_write = esp_xtensa_apptrace_buffs_write,
+	.leave_trace_crit_section_start = esp_xtensa_apptrace_leave_crit_section_start,
+	.leave_trace_crit_section_stop = esp_xtensa_apptrace_leave_crit_section_stop,
+};
+
+uint32_t esp_xtensa_apptrace_block_max_size_get(struct target *target)
+{
+	struct xtensa *xtensa = target_to_xtensa(target);
+	struct xtensa_trace_status trace_status;
+	struct xtensa_trace_config trace_config;
+	uint32_t max_trace_block_sz;
+
+	int res = xtensa_dm_trace_status_read(&xtensa->dbg_mod, &trace_status);
+	if (res != ERROR_OK) {
+		LOG_ERROR("Failed to read TRAX status (%d)!", res);
+		return 0;
+	}
+
+	max_trace_block_sz = BIT(((trace_status.stat >> 8) & 0x1f) - 2) * 4;
+	res = xtensa_dm_trace_config_read(&xtensa->dbg_mod, &trace_config);
+	if (res != ERROR_OK) {
+		LOG_ERROR("Failed to read TRAX config (%d)!", res);
+		return 0;
+	}
+	LOG_DEBUG("ctrl=0x%" PRIx32 " memadrstart=0x%" PRIx32 " memadrend=0x%" PRIx32 " traxadr=0x%" PRIx32,
+		trace_config.ctrl,
+		trace_config.memaddr_start,
+		trace_config.memaddr_end,
+		trace_config.addr);
+
+	return max_trace_block_sz;
+}
+
+uint32_t esp_xtensa_apptrace_usr_block_max_size_get(struct target *target)
+{
+	return esp_xtensa_apptrace_block_max_size_get(target) - sizeof(struct esp_apptrace_host2target_hdr);
+}
+
+int esp_xtensa_apptrace_data_len_read(struct target *target,
+	uint32_t *block_id,
+	uint32_t *len)
+{
+	return esp_xtensa_apptrace_ctrl_reg_read(target, block_id, len, NULL);
+}
+
+int esp_xtensa_apptrace_usr_block_write(struct target *target,
+	uint32_t block_id,
+	const uint8_t *data,
+	uint32_t size)
+{
+	return esp_apptrace_usr_block_write(&esp_xtensa_apptrace_hw, target, block_id, data, size);
+}
+
+static int esp_xtensa_apptrace_data_reverse_read(struct xtensa *xtensa,
+	uint32_t size,
+	uint8_t *buffer,
+	uint8_t *unal_bytes)
+{
+	int res = 0;
+	uint32_t rd_sz = ALIGN_UP(size, 4);
+
+	res = xtensa_queue_dbg_reg_write(xtensa, XDMREG_TRAXADDR, (xtensa->core_config->trace.mem_sz - rd_sz) / 4);
+	if (res != ERROR_OK)
+		return res;
+	if (!IS_ALIGNED(size, 4)) {
+		res = xtensa_queue_dbg_reg_read(xtensa, XDMREG_TRAXDATA, unal_bytes);
+		if (res != ERROR_OK)
+			return res;
+	}
+	for (unsigned int i = size / 4; i != 0; i--) {
+		res = xtensa_queue_dbg_reg_read(xtensa, XDMREG_TRAXDATA, &buffer[(i - 1) * 4]);
+		if (res != ERROR_OK)
+			return res;
+	}
+	return ERROR_OK;
+}
+
+static int esp_xtensa_apptrace_...
 
[truncated message content]

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-145-g0384fe5d5

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  0384fe5d596f42388f8b84d42959d899f29388ab (commit)
      from  ffd9638bdb04fb3021a20f78330c4692a2ebab6a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0384fe5d596f42388f8b84d42959d899f29388ab
Author: Tomas Vanek <va...@fb...>
Date:   Tue Apr 4 13:03:59 2023 +0200

    doc: drop "resume will wait 5 seconds"
    
    Checkpatch-ignore: GIT_COMMIT_ID
    
    Waiting for running state was removed from handle_resume_command()
    in commit a92d27afb073 ("very long and bad structured commit msg
    without anything relevant to resume") around year 2008.
    Update the doc accordingly.
    
    Silent checkpatch or we have to copy 10 or more lines
    of the old commit msg.
    
    Signed-off-by: Tomas Vanek <va...@fb...>
    Change-Id: I3296cb2c29cf80aeed63eddd8fbf352edec778c1
    Reviewed-on: https://review.openocd.org/c/openocd/+/7579
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 67661845d..fe72cf5fa 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -8780,7 +8780,6 @@ power consumption (because the CPU is needlessly clocked).
 @deffn {Command} {resume} [address]
 Resume the target at its current code position,
 or the optional @var{address} if it is provided.
-OpenOCD will wait 5 seconds for the target to resume.
 @end deffn
 
 @deffn {Command} {step} [address]

-----------------------------------------------------------------------

Summary of changes:
 doc/openocd.texi | 1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-144-gffd9638bd

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  ffd9638bdb04fb3021a20f78330c4692a2ebab6a (commit)
      from  e87fa5e3ab424d3ccd66eeddccfbe1e0181e20d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit ffd9638bdb04fb3021a20f78330c4692a2ebab6a
Author: Daniel Anselmi <dan...@gm...>
Date:   Wed Nov 30 04:05:44 2022 +0100

    tcl: cpld/xilinx-xc7: remove virtex-7 devices with ir-length > 6
    
    They have an ir length of 22, 24 or 38 bit and different command codes.
    
    Change-Id: I488e8613f1c4d017e1590111f60b2725ec62964b
    Signed-off-by: Daniel Anselmi <dan...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7387
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/tcl/cpld/xilinx-xc7.cfg b/tcl/cpld/xilinx-xc7.cfg
index 22e0aea7f..91a07f9eb 100644
--- a/tcl/cpld/xilinx-xc7.cfg
+++ b/tcl/cpld/xilinx-xc7.cfg
@@ -33,19 +33,21 @@ jtag newtap $_CHIPNAME tap -irlen 6 -ignore-version \
 	-expected-id 0x03752093 \
 	-expected-id 0x03751093 \
 	-expected-id 0x03671093 \
-	-expected-id 0x036B3093 \
-	-expected-id 0x036B7093 \
-	-expected-id 0x036BB093 \
-	-expected-id 0x036BF093 \
 	-expected-id 0x03667093 \
 	-expected-id 0x03682093 \
 	-expected-id 0x03687093 \
 	-expected-id 0x03692093 \
 	-expected-id 0x03691093 \
-	-expected-id 0x03696093 \
-	-expected-id 0x036D5093 \
-	-expected-id 0x036D9093 \
-	-expected-id 0x036DB093
+	-expected-id 0x03696093
+
+#jtag newtap $_CHIPNAME tap -irlen 24 -ignore-version \
+#	-expected-id 0x036B3093 -expected-id 0x036B7093 \
+#	-expected-id 0x036BB093 -expected-id 0x036BF093 \
+#	-expected-id 0x036D5093
+
+#jtag newtap $_CHIPNAME tap -irlen 22 -ignore-version -expected-id 0x036D9093
+
+#jtag newtap $_CHIPNAME tap -irlen 38 -ignore-version -expected-id 0x036DB093
 
 pld device virtex2 $_CHIPNAME.tap 1
 

-----------------------------------------------------------------------

Summary of changes:
 tcl/cpld/xilinx-xc7.cfg | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-143-ge87fa5e3a

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  e87fa5e3ab424d3ccd66eeddccfbe1e0181e20d0 (commit)
      from  561f27fde9dc51f014b672c227dc7c8ca2530fcf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e87fa5e3ab424d3ccd66eeddccfbe1e0181e20d0
Author: Daniel Anselmi <dan...@gm...>
Date:   Wed Nov 30 03:42:18 2022 +0100

    tcl: zynq_7000: add missing id codes
    
    Add missing ID codes and ignore the version in the ID.
    
    Change-Id: Idd2d3a5eddb6995f3af1c45afd2adf76ce3442bf
    Signed-off-by: Daniel Anselmi <dan...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7386
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/tcl/target/zynq_7000.cfg b/tcl/target/zynq_7000.cfg
index 0272587c1..a6f899541 100644
--- a/tcl/target/zynq_7000.cfg
+++ b/tcl/target/zynq_7000.cfg
@@ -1,18 +1,34 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-#
 # Xilinx Zynq-7000 All Programmable SoC
 #
 # http://www.xilinx.com/products/silicon-devices/soc/zynq-7000/index.htm
+# https://www.xilinx.com/member/forms/download/sim-model-eval-license-xef.html?filename=bsdl_zynq_2.zip
 #
+# 0x03736093  XQ7Z100 XC7Z100I XC7Z100
+# 0x03731093  XQ7Z045 XC7Z045I XC7Z045
+# 0x0372c093  XQ7Z030 XC7Z030I XC7Z030 XA7Z030
+# 0x03727093  XQ7Z020 XC7Z020I XC7Z020 XA7Z020
+# 0x03732093  XC7Z035I XC7Z035
+# 0x0373b093  XC7Z015I XC7Z015
+# 0x03728093  XC7Z014S
+# 0x0373c093  XC7Z012S
+# 0x03722093  XC7Z010I XC7Z010 XA7Z010
+# 0x03723093  XC7Z007S
 
 set _CHIPNAME zynq
 set _TARGETNAME $_CHIPNAME.cpu
 
-jtag newtap zynq_pl bs -irlen 6 -ircapture 0x1 -irmask 0x03 \
-    -expected-id 0x23727093 \
-    -expected-id 0x13722093 \
+jtag newtap zynq_pl bs -irlen 6 -ignore-version -ircapture 0x1 -irmask 0x03 \
+    -expected-id 0x03723093 \
+    -expected-id 0x03722093 \
+    -expected-id 0x0373c093 \
+    -expected-id 0x03728093 \
+    -expected-id 0x0373B093 \
+    -expected-id 0x03732093 \
     -expected-id 0x03727093 \
+    -expected-id 0x0372C093 \
+    -expected-id 0x03731093 \
     -expected-id 0x03736093
 
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id 0x4ba00477

-----------------------------------------------------------------------

Summary of changes:
 tcl/target/zynq_7000.cfg | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-142-g561f27fde

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  561f27fde9dc51f014b672c227dc7c8ca2530fcf (commit)
      from  7e0797d19ac1837e3001df9d45030b5eb97ca36d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 561f27fde9dc51f014b672c227dc7c8ca2530fcf
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Apr 2 14:24:23 2023 +0200

    helper/compiler fix build with gcc on MacOS
    
    On MacOS libc includes files from MacOSX.sdk that define the macro
            #define __nonnull
    without arguments, causing compile error.
    
    Extend the existing check for clang on MacOS and undefine the
    macro for gcc too.
    
    Change-Id: Ic99de78348c6aa86561212a3aded9342e5d32e02
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reported-by: Erhan Kurubas <erh...@es...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7571
    Reviewed-by: Erhan Kurubas <erh...@es...>
    Tested-by: jenkins

diff --git a/src/helper/compiler.h b/src/helper/compiler.h
index 33a075d64..312d261fc 100644
--- a/src/helper/compiler.h
+++ b/src/helper/compiler.h
@@ -36,9 +36,11 @@
  * clang for Apple defines
  * #define __nonnull _Nonnull
  * that is a per argument attribute, incompatible with the gcc per function attribute __nonnull__.
- * Undefine it to keep compatibility among compilers.
+ * gcc for Apple includes sys/cdefs.h from MacOSX.sdk that defines
+ * #define __nonnull
+ * In both cases, undefine __nonnull to keep compatibility among compilers and platforms.
  */
-#if defined(__clang__) && defined(__APPLE__)
+#if defined(__APPLE__)
 # undef __nonnull
 #endif
 #ifndef __nonnull

-----------------------------------------------------------------------

Summary of changes:
 src/helper/compiler.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-141-g7e0797d19

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  7e0797d19ac1837e3001df9d45030b5eb97ca36d (commit)
      from  c8de1b82ec7f74c0717bfa0094f5fb6b79fbbfaf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7e0797d19ac1837e3001df9d45030b5eb97ca36d
Author: Daniel Anselmi <dan...@gm...>
Date:   Wed Dec 14 12:51:48 2022 +0100

    ipdbg: whitespaces
    
    Change-Id: I9294c551cf2e795ad5e3e92dc3926c564424e067
    Signed-off-by: Daniel Anselmi <dan...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7399
    Tested-by: jenkins
    Reviewed-by: Jonathan McDowell <noo...@ea...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/server/ipdbg.c b/src/server/ipdbg.c
index f4a6f6cdc..755d0510e 100644
--- a/src/server/ipdbg.c
+++ b/src/server/ipdbg.c
@@ -90,7 +90,7 @@ static void ipdbg_zero_rd_idx(struct ipdbg_fifo *fifo)
 		return;
 
 	size_t ri = fifo->rd_idx;
-	for (size_t idx = 0 ; idx < fifo->count ; ++idx)
+	for (size_t idx = 0; idx < fifo->count; ++idx)
 		fifo->buffer[idx] = fifo->buffer[ri++];
 	fifo->rd_idx = 0;
 }
@@ -149,7 +149,7 @@ static int ipdbg_max_tools_from_data_register_length(uint8_t data_register_lengt
 static struct ipdbg_service *ipdbg_find_service(struct ipdbg_hub *hub, uint8_t tool)
 {
 	struct ipdbg_service *service;
-	for (service = ipdbg_first_service ; service ; service = service->next) {
+	for (service = ipdbg_first_service; service; service = service->next) {
 		if (service->hub == hub && service->tool == tool)
 			break;
 	}
@@ -160,7 +160,7 @@ static void ipdbg_add_service(struct ipdbg_service *service)
 {
 	struct ipdbg_service *iservice;
 	if (ipdbg_first_service) {
-		for (iservice = ipdbg_first_service ; iservice->next; iservice = iservice->next)
+		for (iservice = ipdbg_first_service; iservice->next; iservice = iservice->next)
 			;
 		iservice->next = service;
 	} else
@@ -192,7 +192,7 @@ static int ipdbg_remove_service(struct ipdbg_service *service)
 		return ERROR_OK;
 	}
 
-	for (struct ipdbg_service *iservice = ipdbg_first_service ; iservice->next ; iservice = iservice->next) {
+	for (struct ipdbg_service *iservice = ipdbg_first_service; iservice->next; iservice = iservice->next) {
 		if (service == iservice->next) {
 			iservice->next = service->next;
 			return ERROR_OK;
@@ -205,7 +205,7 @@ static struct ipdbg_hub *ipdbg_find_hub(struct jtag_tap *tap,
 				uint32_t user_instruction, struct ipdbg_virtual_ir_info *virtual_ir)
 {
 	struct ipdbg_hub *hub = NULL;
-	for (hub = ipdbg_first_hub ; hub ; hub = hub->next) {
+	for (hub = ipdbg_first_hub; hub; hub = hub->next) {
 		if (hub->tap == tap && hub->user_instruction == user_instruction) {
 			if ((!virtual_ir && !hub->virtual_ir) ||
 				 (virtual_ir && hub->virtual_ir &&
@@ -223,7 +223,7 @@ static void ipdbg_add_hub(struct ipdbg_hub *hub)
 {
 	struct ipdbg_hub *ihub;
 	if (ipdbg_first_hub) {
-		for (ihub = ipdbg_first_hub ; ihub->next; ihub = ihub->next)
+		for (ihub = ipdbg_first_hub; ihub->next; ihub = ihub->next)
 			;
 		ihub->next = hub;
 	} else
@@ -281,7 +281,7 @@ static int ipdbg_remove_hub(struct ipdbg_hub *hub)
 		return ERROR_OK;
 	}
 
-	for (struct ipdbg_hub *ihub = ipdbg_first_hub ; ihub->next ; ihub = ihub->next) {
+	for (struct ipdbg_hub *ihub = ipdbg_first_hub; ihub->next; ihub = ihub->next) {
 		if (hub == ihub->next) {
 			ihub->next = hub->next;
 			return ERROR_OK;
@@ -447,7 +447,7 @@ static int ipdbg_polling_callback(void *priv)
 
 	/* transfer dn buffers to jtag-hub */
 	unsigned int num_transfers = 0;
-	for (size_t tool = 0 ; tool < hub->max_tools ; ++tool) {
+	for (size_t tool = 0; tool < hub->max_tools; ++tool) {
 		struct connection *conn = hub->connections[tool];
 		if (conn && conn->priv) {
 			struct ipdbg_connection *connection = conn->priv;
@@ -475,7 +475,7 @@ static int ipdbg_polling_callback(void *priv)
 	}
 
 	/* write from up fifos to sockets */
-	for (size_t tool = 0 ; tool < hub->max_tools ; ++tool) {
+	for (size_t tool = 0; tool < hub->max_tools; ++tool) {
 		struct connection *conn = hub->connections[tool];
 		if (conn && conn->priv) {
 			struct ipdbg_connection *connection = conn->priv;

-----------------------------------------------------------------------

Summary of changes:
 src/server/ipdbg.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-140-gc8de1b82e

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  c8de1b82ec7f74c0717bfa0094f5fb6b79fbbfaf (commit)
      from  90ce9da644d751466d8dc451d7d2a043cdbf7d72 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c8de1b82ec7f74c0717bfa0094f5fb6b79fbbfaf
Author: Antonio Borneo <bor...@gm...>
Date:   Tue Mar 14 15:20:14 2023 +0100

    helper/list: re-align with Linux kernel 6.3-rc1
    
    Minor changes due to kernel switch to 100 char/line.
    Added four new functions.
    
    Silent checkpatch; we don't want to diverge from Linux reference
    code.
    Checkpatch-ignore: MACRO_ARG_REUSE, UNNECESSARY_PARENTHESES
    Checkpatch-ignore: MACRO_ARG_PRECEDENCE
    
    Change-Id: I1d2ff25bf3bab8cd0f5c9be55c7501795490ea75
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7568
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/helper/list.h b/src/helper/list.h
index 396ff06c9..c9de0569b 100644
--- a/src/helper/list.h
+++ b/src/helper/list.h
@@ -265,8 +265,7 @@ static inline void list_bulk_move_tail(struct list_head *head,
  * @param list the entry to test
  * @param head the head of the list
  */
-static inline int list_is_first(const struct list_head *list,
-					const struct list_head *head)
+static inline int list_is_first(const struct list_head *list, const struct list_head *head)
 {
 	return list->prev == head;
 }
@@ -276,12 +275,21 @@ static inline int list_is_first(const struct list_head *list,
  * @param list the entry to test
  * @param head the head of the list
  */
-static inline int list_is_last(const struct list_head *list,
-				const struct list_head *head)
+static inline int list_is_last(const struct list_head *list, const struct list_head *head)
 {
 	return list->next == head;
 }
 
+/**
+ * list_is_head - tests whether @a list is the list @a head
+ * @param list the entry to test
+ * @param head the head of the list
+ */
+static inline int list_is_head(const struct list_head *list, const struct list_head *head)
+{
+	return list == head;
+}
+
 /**
  * list_empty - tests whether a list is empty
  * @param head the list to test.
@@ -400,10 +408,9 @@ static inline void list_cut_position(struct list_head *list,
 {
 	if (list_empty(head))
 		return;
-	if (list_is_singular(head) &&
-		(head->next != entry && head != entry))
+	if (list_is_singular(head) && !list_is_head(entry, head) && (entry != head->next))
 		return;
-	if (entry == head)
+	if (list_is_head(entry, head))
 		INIT_LIST_HEAD(list);
 	else
 		__list_cut_position(list, head, entry);
@@ -563,6 +570,19 @@ static inline void list_splice_tail_init(struct list_head *list,
 #define list_next_entry(pos, member) \
 	list_entry((pos)->member.next, typeof(*(pos)), member)
 
+/**
+ * list_next_entry_circular - get the next element in list
+ * @param pos    the type * to cursor.
+ * @param head   the list head to take the element from.
+ * @param member the name of the list_head within the struct.
+ *
+ * Wraparound if pos is the last element (return the first element).
+ * Note, that list is expected to be not empty.
+ */
+#define list_next_entry_circular(pos, head, member) \
+	(list_is_last(&(pos)->member, head) ? \
+	list_first_entry(head, typeof(*(pos)), member) : list_next_entry(pos, member))
+
 /**
  * list_prev_entry - get the prev element in list
  * @param pos    the type * to cursor
@@ -571,13 +591,28 @@ static inline void list_splice_tail_init(struct list_head *list,
 #define list_prev_entry(pos, member) \
 	list_entry((pos)->member.prev, typeof(*(pos)), member)
 
+/**
+ * list_prev_entry_circular - get the prev element in list
+ * @param pos    the type * to cursor.
+ * @param head   the list head to take the element from.
+ * @param member the name of the list_head within the struct.
+ *
+ * Wraparound if pos is the first element (return the last element).
+ * Note, that list is expected to be not empty.
+ */
+#define list_prev_entry_circular(pos, head, member) \
+	(list_is_first(&(pos)->member, head) ? \
+	list_last_entry(head, typeof(*(pos)), member) : list_prev_entry(pos, member))
+
 /**
  * list_for_each	-	iterate over a list
  * @param pos  the &struct list_head to use as a loop cursor.
  * @param head the head for your list.
  */
 #define list_for_each(pos, head) \
-	for (pos = (head)->next; pos != (head); pos = pos->next)
+	for (pos = (head)->next; !list_is_head(pos, (head)); pos = pos->next)
+
+/* Ignore kernel list_for_each_rcu() */
 
 /**
  * list_for_each_continue - continue iteration over a list
@@ -618,6 +653,21 @@ static inline void list_splice_tail_init(struct list_head *list,
 	     pos != (head); \
 	     pos = n, n = pos->prev)
 
+/**
+ * list_count_nodes - count nodes in the list
+ * @param head	the head for your list.
+ */
+static inline size_t list_count_nodes(struct list_head *head)
+{
+	struct list_head *pos;
+	size_t count = 0;
+
+	list_for_each(pos, head)
+		count++;
+
+	return count;
+}
+
 /**
  * list_entry_is_head - test if the entry points to the head of the list
  * @param pos    the type * to cursor

-----------------------------------------------------------------------

Summary of changes:
 src/helper/list.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 58 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-139-g90ce9da64

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  90ce9da644d751466d8dc451d7d2a043cdbf7d72 (commit)
      from  55e04e3157cd4d817cfd39c6f1384f96d61a0951 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 90ce9da644d751466d8dc451d7d2a043cdbf7d72
Author: Antonio Borneo <bor...@gm...>
Date:   Tue Mar 14 15:01:18 2023 +0100

    helper/list: remove unused hlist_*
    
    The file list.h is taken from Linux and includes two similar
    implementation of double linked lists:
    - with single linked list's head (hlist_*), and
    - with double linked list's head (list_*).
    While the former offers a minor memory footprint improvement,
    keeping two implementations makes harder for newbie developers
    to approach them.
    
    So far only the latter implementation has been used and no new
    patches in gerrit is going to change that.
    
    Drop the support for lists with single linked head.
    It can be easily taken back from git history, if needed.
    
    Change-Id: I420e5de38ab755fdfbeb2115538c61818308ec2b
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7567
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/helper/list.h b/src/helper/list.h
index 552a3202a..396ff06c9 100644
--- a/src/helper/list.h
+++ b/src/helper/list.h
@@ -27,13 +27,6 @@ struct list_head {
 	struct list_head *next, *prev;
 };
 
-struct hlist_head {
-	struct hlist_node *first;
-};
-
-struct hlist_node {
-	struct hlist_node *next, **pprev;
-};
 /* end local changes */
 
 /*
@@ -811,237 +804,7 @@ static inline void list_splice_tail_init(struct list_head *list,
 
 /*
  * Double linked lists with a single pointer list head.
- * Mostly useful for hash tables where the two pointer list head is
- * too wasteful.
- * You lose the ability to access the tail in O(1).
- */
-
-#define HLIST_HEAD_INIT { .first = NULL }
-#define HLIST_HEAD(name) struct hlist_head name = {  .first = NULL }
-#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
-static inline void INIT_HLIST_NODE(struct hlist_node *h)
-{
-	h->next = NULL;
-	h->pprev = NULL;
-}
-
-/**
- * hlist_unhashed - Has node been removed from list and reinitialized?
- * @param h Node to be checked
- *
- * Not that not all removal functions will leave a node in unhashed
- * state.  For example, hlist_nulls_del_init_rcu() does leave the
- * node in unhashed state, but hlist_nulls_del() does not.
- */
-static inline int hlist_unhashed(const struct hlist_node *h)
-{
-	return !h->pprev;
-}
-
-/* Ignore kernel hlist_unhashed_lockless() */
-
-/**
- * hlist_empty - Is the specified hlist_head structure an empty hlist?
- * @param h Structure to check.
- */
-static inline int hlist_empty(const struct hlist_head *h)
-{
-	return !h->first;
-}
-
-static inline void __hlist_del(struct hlist_node *n)
-{
-	struct hlist_node *next = n->next;
-	struct hlist_node **pprev = n->pprev;
-
-	*pprev = next;
-	if (next)
-		next->pprev = pprev;
-}
-
-/**
- * hlist_del - Delete the specified hlist_node from its list
- * @param n Node to delete.
- *
- * Note that this function leaves the node in hashed state.  Use
- * hlist_del_init() or similar instead to unhash @a n.
- */
-static inline void hlist_del(struct hlist_node *n)
-{
-	__hlist_del(n);
-	n->next = LIST_POISON1;
-	n->pprev = LIST_POISON2;
-}
-
-/**
- * hlist_del_init - Delete the specified hlist_node from its list and initialize
- * @param n Node to delete.
- *
- * Note that this function leaves the node in unhashed state.
- */
-static inline void hlist_del_init(struct hlist_node *n)
-{
-	if (!hlist_unhashed(n)) {
-		__hlist_del(n);
-		INIT_HLIST_NODE(n);
-	}
-}
-
-/**
- * hlist_add_head - add a new entry at the beginning of the hlist
- * @param n new entry to be added
- * @param h hlist head to add it after
- *
- * Insert a new entry after the specified head.
- * This is good for implementing stacks.
- */
-static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
-{
-	struct hlist_node *first = h->first;
-	n->next = first;
-	if (first)
-		first->pprev = &n->next;
-	h->first = n;
-	n->pprev = &h->first;
-}
-
-/**
- * hlist_add_before - add a new entry before the one specified
- * @param n    new entry to be added
- * @param next hlist node to add it before, which must be non-NULL
- */
-static inline void hlist_add_before(struct hlist_node *n,
-				    struct hlist_node *next)
-{
-	n->pprev = next->pprev;
-	n->next = next;
-	next->pprev = &n->next;
-	*(n->pprev) = n;
-}
-
-/**
- * hlist_add_behind - add a new entry after the one specified
- * @param n    new entry to be added
- * @param prev hlist node to add it after, which must be non-NULL
- */
-static inline void hlist_add_behind(struct hlist_node *n,
-				    struct hlist_node *prev)
-{
-	n->next = prev->next;
-	prev->next = n;
-	n->pprev = &prev->next;
-
-	if (n->next)
-		n->next->pprev = &n->next;
-}
-
-/**
- * hlist_add_fake - create a fake hlist consisting of a single headless node
- * @param n Node to make a fake list out of
- *
- * This makes @a n appear to be its own predecessor on a headless hlist.
- * The point of this is to allow things like hlist_del() to work correctly
- * in cases where there is no list.
- */
-static inline void hlist_add_fake(struct hlist_node *n)
-{
-	n->pprev = &n->next;
-}
-
-/**
- * hlist_fake: Is this node a fake hlist?
- * @param h Node to check for being a self-referential fake hlist.
- */
-static inline bool hlist_fake(struct hlist_node *h)
-{
-	return h->pprev == &h->next;
-}
-
-/**
- * hlist_is_singular_node - is node the only element of the specified hlist?
- * @param n Node to check for singularity.
- * @param h Header for potentially singular list.
- *
- * Check whether the node is the only node of the head without
- * accessing head, thus avoiding unnecessary cache misses.
- */
-static inline bool
-hlist_is_singular_node(struct hlist_node *n, struct hlist_head *h)
-{
-	return !n->next && n->pprev == &h->first;
-}
-
-/**
- * hlist_move_list - Move an hlist
- * @param old hlist_head for old list.
- * @param new hlist_head for new list.
- *
- * Move a list from one list head to another. Fixup the pprev
- * reference of the first entry if it exists.
- */
-static inline void hlist_move_list(struct hlist_head *old,
-				   struct hlist_head *new)
-{
-	new->first = old->first;
-	if (new->first)
-		new->first->pprev = &new->first;
-	old->first = NULL;
-}
-
-#define hlist_entry(ptr, type, member) container_of(ptr, type, member)
-
-#define hlist_for_each(pos, head) \
-	for (pos = (head)->first; pos ; pos = pos->next)
-
-#define hlist_for_each_safe(pos, n, head) \
-	for (pos = (head)->first; pos && ({ n = pos->next; 1; }); \
-	     pos = n)
-
-#define hlist_entry_safe(ptr, type, member) \
-	({ typeof(ptr) ____ptr = (ptr); \
-	   ____ptr ? hlist_entry(____ptr, type, member) : NULL; \
-	})
-
-/**
- * hlist_for_each_entry	- iterate over list of given type
- * @param pos    the type * to use as a loop cursor.
- * @param head   the head for your list.
- * @param member the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry(pos, head, member)				\
-	for (pos = hlist_entry_safe((head)->first, typeof(*(pos)), member);\
-	     pos;							\
-	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
-
-/**
- * hlist_for_each_entry_continue - iterate over a hlist continuing after current point
- * @param pos    the type * to use as a loop cursor.
- * @param member the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_continue(pos, member)			\
-	for (pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member);\
-	     pos;							\
-	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
-
-/**
- * hlist_for_each_entry_from - iterate over a hlist continuing from current point
- * @param pos    the type * to use as a loop cursor.
- * @param member the name of the hlist_node within the struct.
- */
-#define hlist_for_each_entry_from(pos, member)				\
-	for (; pos;							\
-	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
-
-/**
- * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
- * @param pos    the type * to use as a loop cursor.
- * @param n      a &struct hlist_node to use as temporary storage
- * @param head   the head for your list.
- * @param member the name of the hlist_node within the struct.
+ * IGNORED
  */
-#define hlist_for_each_entry_safe(pos, n, head, member)		\
-	for (pos = hlist_entry_safe((head)->first, typeof(*pos), member);\
-	     pos && ({ n = pos->member.next; 1; });			\
-	     pos = hlist_entry_safe(n, typeof(*pos), member))
 
 #endif /* OPENOCD_HELPER_LIST_H */

-----------------------------------------------------------------------

Summary of changes:
 src/helper/list.h | 239 +-----------------------------------------------------
 1 file changed, 1 insertion(+), 238 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-138-g55e04e315

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  55e04e3157cd4d817cfd39c6f1384f96d61a0951 (commit)
      from  18aacc8bf3ff7c7481673cbbfe82f0104e4dccf9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 55e04e3157cd4d817cfd39c6f1384f96d61a0951
Author: François LEGAL <de...@th...>
Date:   Wed Mar 29 17:46:38 2023 +0200

    src/target/mips_m4k : add fast read method
    
    Add the fast read method to speed up flash verification
    after programming. Works the same as fast write already
    implemented.
    
    Signed-off-by: François LEGAL <de...@th...>
    Change-Id: I74611a3542a88212f0483ec8ee368aba3d1f03c7
    Reviewed-on: https://review.openocd.org/c/openocd/+/7564
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index d3b07585d..14e3f3b27 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -36,6 +36,8 @@ static int mips_m4k_internal_restore(struct target *target, int current,
 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);
+static int mips_m4k_bulk_read_memory(struct target *target, target_addr_t address,
+		uint32_t count, uint8_t *buffer);
 
 static int mips_m4k_examine_debug_reason(struct target *target)
 {
@@ -1021,6 +1023,12 @@ static int mips_m4k_read_memory(struct target *target, target_addr_t address,
 	if (((size == 4) && (address & 0x3u)) || ((size == 2) && (address & 0x1u)))
 		return ERROR_TARGET_UNALIGNED_ACCESS;
 
+	if (size == 4 && count > 32) {
+		int retval = mips_m4k_bulk_read_memory(target, address, count, buffer);
+		if (retval == ERROR_OK)
+			return ERROR_OK;
+		LOG_WARNING("Falling back to non-bulk read");
+	}
 	/* since we don't know if buffer is aligned, we allocate new mem that is always aligned */
 	void *t = NULL;
 
@@ -1249,6 +1257,71 @@ static int mips_m4k_bulk_write_memory(struct target *target, target_addr_t addre
 	return retval;
 }
 
+static int mips_m4k_bulk_read_memory(struct target *target, target_addr_t address,
+		uint32_t count, uint8_t *buffer)
+{
+	struct mips32_common *mips32 = target_to_mips32(target);
+	struct mips_ejtag *ejtag_info = &mips32->ejtag_info;
+	struct working_area *fast_data_area;
+	int retval;
+	int write_t = 0;
+
+	LOG_DEBUG("address: " TARGET_ADDR_FMT ", count: 0x%8.8" PRIx32 "",
+			address, count);
+
+	/* check alignment */
+	if (address & 0x3u)
+		return ERROR_TARGET_UNALIGNED_ACCESS;
+
+	if (!mips32->fast_data_area) {
+		/* Get memory for block read handler
+		 * we preserve this area between calls and gain a speed increase
+		 * of about 3kb/sec when reading flash
+		 * this will be released/nulled by the system when the target is resumed or reset */
+		retval = target_alloc_working_area(target,
+				MIPS32_FASTDATA_HANDLER_SIZE,
+				&mips32->fast_data_area);
+		if (retval != ERROR_OK) {
+			LOG_ERROR("No working area available");
+			return retval;
+		}
+
+		/* reset fastadata state so the algo get reloaded */
+		ejtag_info->fast_access_save = -1;
+	}
+
+	fast_data_area = mips32->fast_data_area;
+
+	if (address < (fast_data_area->address + fast_data_area->size) &&
+			fast_data_area->address < (address + count)) {
+		LOG_ERROR("fast_data (" TARGET_ADDR_FMT ") is within read area "
+				"(" TARGET_ADDR_FMT "-" TARGET_ADDR_FMT ").",
+				fast_data_area->address, address, address + count);
+		LOG_ERROR("Change work-area-phys or load_image address!");
+		return ERROR_FAIL;
+	}
+
+	/* mips32_pracc_fastdata_xfer requires uint32_t in host endianness, */
+	/* but byte array represents target endianness                      */
+	uint32_t *t = malloc(count * sizeof(uint32_t));
+	if (!t) {
+		LOG_ERROR("Out of memory");
+		return ERROR_FAIL;
+	}
+
+	retval = mips32_pracc_fastdata_xfer(ejtag_info, mips32->fast_data_area, write_t, address,
+			count, t);
+
+	target_buffer_set_u32_array(target, buffer, count, t);
+
+	free(t);
+
+	if (retval != ERROR_OK)
+		LOG_ERROR("Fastdata access Failed");
+
+	return retval;
+}
+
 static int mips_m4k_verify_pointer(struct command_invocation *cmd,
 		struct mips_m4k_common *mips_m4k)
 {

-----------------------------------------------------------------------

Summary of changes:
 src/target/mips_m4k.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-137-g18aacc8bf

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  18aacc8bf3ff7c7481673cbbfe82f0104e4dccf9 (commit)
      from  41037eb26585114209c3c8f1d63f7788a421df07 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 18aacc8bf3ff7c7481673cbbfe82f0104e4dccf9
Author: François LEGAL <de...@th...>
Date:   Wed Mar 29 14:19:48 2023 +0200

    src/target/mips_m4k : fix condition on overlapping workspace data area
    
    The condition to check if the workspace area (used by actual MIPS code
    executed on target) and data area (sandbox to put data to be read/written
    to/from flash) is wrong, thus preventing the use of FAST_* commands to
    program/verify FLASH.
    
    Signed-off-by: François LEGAL <de...@th...>
    Change-Id: Ic68424b7f42d44e550433a120093db5e7980fd56
    Reviewed-on: https://review.openocd.org/c/openocd/+/7563
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/target/mips_m4k.c b/src/target/mips_m4k.c
index 491b247b1..d3b07585d 100644
--- a/src/target/mips_m4k.c
+++ b/src/target/mips_m4k.c
@@ -1218,8 +1218,8 @@ static int mips_m4k_bulk_write_memory(struct target *target, target_addr_t addre
 
 	fast_data_area = mips32->fast_data_area;
 
-	if (address <= fast_data_area->address + fast_data_area->size &&
-			fast_data_area->address <= address + count) {
+	if (address < (fast_data_area->address + fast_data_area->size) &&
+			fast_data_area->address < (address + count)) {
 		LOG_ERROR("fast_data (" TARGET_ADDR_FMT ") is within write area "
 			  "(" TARGET_ADDR_FMT "-" TARGET_ADDR_FMT ").",
 			  fast_data_area->address, address, address + count);

-----------------------------------------------------------------------

Summary of changes:
 src/target/mips_m4k.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-136-g41037eb26

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  41037eb26585114209c3c8f1d63f7788a421df07 (commit)
      from  99ec5760961d264599a9c9fb1a4d5d6042bc3ba8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 41037eb26585114209c3c8f1d63f7788a421df07
Author: Chao Du <du...@es...>
Date:   Wed Mar 22 06:51:51 2023 +0000

    rtos/FreeRTOS: some optimization of freertos_update_threads()
    
    1.
    update the rtos->thread_count in time, to make sure the allocated
    thread_name_str and extra_info_str could be freed by
    rtos_free_threadlist(). Otherwise the abnormal return may cause a
    memory leak.
    2.
    remove a redundant assignment to threadid.
    
    Signed-off-by: Chao Du <du...@es...>
    Change-Id: Ifabc59d501c925b3d6aec8b04b2856d2c31cc4e2
    Reviewed-on: https://review.openocd.org/c/openocd/+/7549
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c
index 070275f2c..e8df030aa 100644
--- a/src/rtos/FreeRTOS.c
+++ b/src/rtos/FreeRTOS.c
@@ -312,7 +312,6 @@ static int freertos_update_threads(struct rtos *rtos)
 				(list_elem_ptr != prev_list_elem_ptr) &&
 				(tasks_found < thread_list_size)) {
 			/* Get the location of the thread structure. */
-			rtos->thread_details[tasks_found].threadid = 0;
 			retval = target_read_u32(rtos->target,
 					list_elem_ptr + param->list_elem_content_offset,
 					&pointer_casts_are_bad);
@@ -365,6 +364,7 @@ static int freertos_update_threads(struct rtos *rtos)
 
 			tasks_found++;
 			list_thread_count--;
+			rtos->thread_count = tasks_found;
 
 			prev_list_elem_ptr = list_elem_ptr;
 			list_elem_ptr = 0;
@@ -383,7 +383,6 @@ static int freertos_update_threads(struct rtos *rtos)
 	}
 
 	free(list_of_lists);
-	rtos->thread_count = tasks_found;
 	return 0;
 }
 

-----------------------------------------------------------------------

Summary of changes:
 src/rtos/FreeRTOS.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-135-g99ec57609

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  99ec5760961d264599a9c9fb1a4d5d6042bc3ba8 (commit)
      from  4b9b55a832e43815a1dd1b219107a01a1beadc1e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 99ec5760961d264599a9c9fb1a4d5d6042bc3ba8
Author: Erhan Kurubas <erh...@es...>
Date:   Sat Mar 25 03:00:51 2023 +0300

    github/workflow: build libjaylink from source
    
    Libjaylink submodule disabled by default at
    https://review.openocd.org/c/openocd/+/7129
    
    --enable-internal-libjaylink config option will be deprecated soon.
    
    So, building the source is a permanent solution.
    
    Signed-off-by: Erhan Kurubas <erh...@es...>
    Change-Id: Id06654d806a3a49f35e3ba41e9e4cc58c1a0d388
    Reviewed-on: https://review.openocd.org/c/openocd/+/7552
    Tested-by: jenkins
    Reviewed-by: zapb <de...@za...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index b48388ef7..f5cf56459 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -56,6 +56,16 @@ jobs:
           wget "https://github.com/aquynh/capstone/archive/${CAPSTONE_VER}.tar.gz"
           tar -xzf ${CAPSTONE_VER}.tar.gz
           echo "CAPSTONE_SRC=$PWD/capstone-${CAPSTONE_VER}" >> $GITHUB_ENV
+      - name: Prepare libjaylink
+        env:
+          LIBJAYLINK_VER: 0.3.1
+        run: |
+          mkdir -p $DL_DIR && cd $DL_DIR
+          wget https://gitlab.zapb.de/libjaylink/libjaylink/-/archive/${LIBJAYLINK_VER}/libjaylink-${LIBJAYLINK_VER}.tar.gz
+          tar -xzf libjaylink-${LIBJAYLINK_VER}.tar.gz
+          cd libjaylink-${LIBJAYLINK_VER}
+          ./autogen.sh
+          echo "LIBJAYLINK_SRC=$PWD" >> $GITHUB_ENV
       - name: Package OpenOCD for windows
         env:
           MAKE_JOBS: 2
@@ -64,6 +74,7 @@ jobs:
           HIDAPI_CONFIG: --enable-shared --disable-static --disable-testgui
           LIBFTDI_CONFIG: -DSTATICLIBS=OFF -DEXAMPLES=OFF -DFTDI_EEPROM=OFF
           CAPSTONE_CONFIG: "CAPSTONE_BUILD_CORE_ONLY=yes CAPSTONE_STATIC=yes CAPSTONE_SHARED=no"
+          LIBJAYLINK_CONFIG: --enable-shared --disable-static
         run: |
           # check if there is tag pointing at HEAD, otherwise take the HEAD SHA-1 as OPENOCD_TAG
           OPENOCD_TAG="`git tag --points-at HEAD`"
diff --git a/contrib/cross-build.sh b/contrib/cross-build.sh
index b199bf715..bb8c8c47d 100755
--- a/contrib/cross-build.sh
+++ b/contrib/cross-build.sh
@@ -41,12 +41,14 @@ WORK_DIR=$PWD
 : ${HIDAPI_SRC:=/path/to/hidapi}
 : ${LIBFTDI_SRC:=/path/to/libftdi}
 : ${CAPSTONE_SRC:=/path/to/capstone}
+: ${LIBJAYLINK_SRC:=/path/to/libjaylink}
 
 OPENOCD_SRC=`readlink -m $OPENOCD_SRC`
 LIBUSB1_SRC=`readlink -m $LIBUSB1_SRC`
 HIDAPI_SRC=`readlink -m $HIDAPI_SRC`
 LIBFTDI_SRC=`readlink -m $LIBFTDI_SRC`
 CAPSTONE_SRC=`readlink -m $CAPSTONE_SRC`
+LIBJAYLINK_SRC=`readlink -m $LIBJAYLINK_SRC`
 
 HOST_TRIPLET=$1
 BUILD_DIR=$WORK_DIR/$HOST_TRIPLET-build
@@ -54,6 +56,7 @@ LIBUSB1_BUILD_DIR=$BUILD_DIR/libusb1
 HIDAPI_BUILD_DIR=$BUILD_DIR/hidapi
 LIBFTDI_BUILD_DIR=$BUILD_DIR/libftdi
 CAPSTONE_BUILD_DIR=$BUILD_DIR/capstone
+LIBJAYLINK_BUILD_DIR=$BUILD_DIR/libjaylink
 OPENOCD_BUILD_DIR=$BUILD_DIR/openocd
 
 ## Root of host file tree
@@ -158,6 +161,16 @@ libdir=${exec_prefix}/lib \
 includedir=${prefix}/include/capstone\n\n;' $CAPSTONE_PC_FILE
 fi
 
+# libjaylink build & install into sysroot
+if [ -d $LIBJAYLINK_SRC ] ; then
+  mkdir -p $LIBJAYLINK_BUILD_DIR
+  cd $LIBJAYLINK_BUILD_DIR
+  $LIBJAYLINK_SRC/configure --build=`$LIBJAYLINK_SRC/config.guess` --host=$HOST_TRIPLET \
+    --with-sysroot=$SYSROOT --prefix=$PREFIX \
+    $LIBJAYLINK_CONFIG
+  make -j $MAKE_JOBS
+  make install DESTDIR=$SYSROOT
+fi
 
 # OpenOCD build & install into sysroot
 mkdir -p $OPENOCD_BUILD_DIR

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/snapshot.yml | 11 +++++++++++
 contrib/cross-build.sh         | 13 +++++++++++++
 2 files changed, 24 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-134-g4b9b55a83

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  4b9b55a832e43815a1dd1b219107a01a1beadc1e (commit)
      from  c1b14d678fd77095ef5c076c0e927aeed6a753c7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4b9b55a832e43815a1dd1b219107a01a1beadc1e
Author: Erhan Kurubas <erh...@es...>
Date:   Sat Mar 25 02:56:19 2023 +0300

    github/workflow: increase delete-tag-and-release version
    
    During setup job in the GH actions, GH tries to resolve
    all actions before starting to run the scripts.
    It can not find 0.2.0 version inside
    'dev-drprasad/delete-tag-and-release 'repo and action fails.
    
    This patch fixes that error.
    Also, switched to the latest ubuntu image
    Hidapi version updated to 0.13.1
    
    Signed-off-by: Erhan Kurubas <erh...@es...>
    Change-Id: I02af41f6189d5a28f874c9b008073d74de46b4ca
    Reviewed-on: https://review.openocd.org/c/openocd/+/7551
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
index e5997a055..b48388ef7 100644
--- a/.github/workflows/snapshot.yml
+++ b/.github/workflows/snapshot.yml
@@ -8,7 +8,7 @@ name: OpenOCD Snapshot
 
 jobs:
   package:
-    runs-on: [ubuntu-18.04]
+    runs-on: [ubuntu-20.04]
     env:
       DL_DIR: ../downloads
       BUILD_DIR: ../build
@@ -30,7 +30,7 @@ jobs:
           echo "LIBUSB1_SRC=$PWD/libusb-${LIBUSB1_VER}" >> $GITHUB_ENV
       - name: Prepare hidapi
         env:
-          HIDAPI_VER: 0.11.2
+          HIDAPI_VER: 0.13.1
         run: |
           mkdir -p $DL_DIR && cd $DL_DIR
           wget "https://github.com/libusb/hidapi/archive/hidapi-${HIDAPI_VER}.tar.gz"
@@ -82,6 +82,7 @@ jobs:
           # add missing dlls
           cd $HOST-root/usr
           cp `$HOST-gcc --print-file-name=libwinpthread-1.dll` ./bin/
+          # required by libftdi1.dll. For the gcc-mingw-10.3.x or later "libgcc_s_dw2-1.dll" will need to be copied.
           cp `$HOST-gcc --print-file-name=libgcc_s_sjlj-1.dll` ./bin/
           # prepare the artifact
           ARTIFACT="openocd-${OPENOCD_TAG}-${HOST}.tar.gz"
@@ -90,11 +91,11 @@ jobs:
           echo "IS_PRE_RELEASE=$IS_PRE_RELEASE" >> $GITHUB_ENV
           echo "ARTIFACT_PATH=$PWD/$ARTIFACT" >> $GITHUB_ENV
       - name: Publish OpenOCD packaged for windows
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           path: ${{ env.ARTIFACT_PATH }}
       - name: Delete 'latest' Release
-        uses: dev-drprasad/delete-tag-and-release@v0.2.0
+        uses: dev-drprasad/delete-tag-and-release@v0.2.1
         with:
           delete_release: true
           tag_name: ${{ env.RELEASE_NAME }}

-----------------------------------------------------------------------

Summary of changes:
 .github/workflows/snapshot.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-133-gc1b14d678

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  c1b14d678fd77095ef5c076c0e927aeed6a753c7 (commit)
      from  b939224ab6e6e28e5211aac0303951ae4fabaf1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c1b14d678fd77095ef5c076c0e927aeed6a753c7
Author: panciyan <pan...@es...>
Date:   Mon Mar 20 02:26:58 2023 +0000

    flash/nor: missing fileio_close.
    
    If the file read abnormally, need to close it which was opened before.
    
    Signed-off-by: panciyan <pan...@es...>
    Change-Id: I6142f154741dcd38088b7add2793219ee4dd2ae9
    Reviewed-on: https://review.openocd.org/c/openocd/+/7546
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/flash/nor/tcl.c b/src/flash/nor/tcl.c
index ecbcf00aa..22c1710ad 100644
--- a/src/flash/nor/tcl.c
+++ b/src/flash/nor/tcl.c
@@ -814,6 +814,7 @@ COMMAND_HANDLER(handle_flash_write_bank_command)
 	if (buf_cnt != length) {
 		LOG_ERROR("Short read");
 		free(buffer);
+		fileio_close(fileio);
 		return ERROR_FAIL;
 	}
 

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nor/tcl.c | 1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-132-gb939224ab

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  b939224ab6e6e28e5211aac0303951ae4fabaf1f (commit)
      from  f0e8f7b790f6d945c35b4bb868cafee5fcea3a22 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b939224ab6e6e28e5211aac0303951ae4fabaf1f
Author: Wolfram Sang <ws...@ke...>
Date:   Sun Mar 5 08:38:14 2023 +0100

    tcl/board: add Calao USB-A9G20
    
    Add a basic config.
    
    Signed-off-by: Wolfram Sang <ws...@ke...>
    Change-Id: Ie68e5fbb26b1c2f3028e561af0255fa71ec61828
    Reviewed-on: https://review.openocd.org/c/openocd/+/7524
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/tcl/board/calao-usb-a9g20-c01.cfg b/tcl/board/calao-usb-a9g20-c01.cfg
new file mode 100644
index 000000000..6c4bd40fe
--- /dev/null
+++ b/tcl/board/calao-usb-a9g20-c01.cfg
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# CALAO Systems USB-A9G20-C01
+
+adapter driver ftdi
+ftdi device_desc "USB-A9G20"
+ftdi vid_pid 0x0403 0x6010
+ftdi layout_init 0x0c08 0x0f1b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
+
+transport select jtag
+
+source [find target/at91sam9g20.cfg]

-----------------------------------------------------------------------

Summary of changes:
 tcl/board/{calao-usb-a9260.cfg => calao-usb-a9g20-c01.cfg} | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 copy tcl/board/{calao-usb-a9260.cfg => calao-usb-a9g20-c01.cfg} (60%)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-131-gf0e8f7b79

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  f0e8f7b790f6d945c35b4bb868cafee5fcea3a22 (commit)
      from  e9a7221b68d0775d9c96c8a12a7a26e2729caf37 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f0e8f7b790f6d945c35b4bb868cafee5fcea3a22
Author: Wolfram Sang <ws...@ke...>
Date:   Fri Mar 3 12:26:46 2023 +0100

    tcl/board/calao-usb-a9260: fix and refactor broken support
    
    The old configuration files did not work because of a missing
    'at91sam9260minimal.cfg' file. Also, the config files were placed
    wrongly. Update them, put them to the proper location, merge the two
    supported boards into one, remove now superfluous include, remove
    defunct web page, etc.. Tested with a Calao USB-A9G20 and a hacked
    'device_desc' to match. Native support for it will come next.
    
    Signed-off-by: Wolfram Sang <ws...@ke...>
    Change-Id: Iec578c8777c5a6134e132dbac17c2988c7634742
    Reviewed-on: https://review.openocd.org/c/openocd/+/7522
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/tcl/board/calao-usb-a9260.cfg b/tcl/board/calao-usb-a9260.cfg
new file mode 100644
index 000000000..52fede0fa
--- /dev/null
+++ b/tcl/board/calao-usb-a9260.cfg
@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# CALAO Systems USB-A9260 (C01 and C02)
+
+adapter driver ftdi
+ftdi device_desc "USB-A9260"
+ftdi vid_pid 0x0403 0x6001 0x0403 0x6010
+ftdi layout_init 0x0c08 0x0f1b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
+
+transport select jtag
+
+source [find target/at91sam9260.cfg]
diff --git a/tcl/interface/calao-usb-a9260.cfg b/tcl/interface/calao-usb-a9260.cfg
deleted file mode 100644
index ff652ef8f..000000000
--- a/tcl/interface/calao-usb-a9260.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-#
-# CALAO Systems USB-A9260 common -C01 -C02 setup
-#
-# http://www.calao-systems.com/
-#
-# See calao-usb-a9260-c01.cfg and calao-usb-a9260-c02.cfg.
-#
-
-adapter srst delay 200
-jtag_ntrst_delay 200
diff --git a/tcl/interface/ftdi/calao-usb-a9260-c01.cfg b/tcl/interface/ftdi/calao-usb-a9260-c01.cfg
deleted file mode 100644
index c84e77874..000000000
--- a/tcl/interface/ftdi/calao-usb-a9260-c01.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-#
-# CALAO Systems USB-A9260-C01
-#
-# http://www.calao-systems.com/
-#
-
-echo "WARNING!"
-echo "This file was not tested with real interface, but is assumed to work as this"
-echo "interface uses the same layout as configs that were verified. Please report your"
-echo "experience with this file to openocd-devel mailing list, so it could be marked"
-echo "as working or fixed."
-
-adapter driver ftdi
-ftdi device_desc "USB-A9260"
-ftdi vid_pid 0x0403 0x6010
-
-ftdi layout_init 0x0c08 0x0f1b
-ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
-
-script interface/calao-usb-a9260.cfg
-script target/at91sam9260minimal.cfg
diff --git a/tcl/interface/ftdi/calao-usb-a9260-c02.cfg b/tcl/interface/ftdi/calao-usb-a9260-c02.cfg
deleted file mode 100644
index 9d79b2600..000000000
--- a/tcl/interface/ftdi/calao-usb-a9260-c02.cfg
+++ /dev/null
@@ -1,24 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-#
-# CALAO Systems USB-A9260-C02
-#
-# http://www.calao-systems.com/
-#
-
-echo "WARNING!"
-echo "This file was not tested with real interface, but is assumed to work as this"
-echo "interface uses the same layout as configs that were verified. Please report your"
-echo "experience with this file to openocd-devel mailing list, so it could be marked"
-echo "as working or fixed."
-
-adapter driver ftdi
-ftdi device_desc "USB-A9260"
-ftdi vid_pid 0x0403 0x6001
-
-ftdi layout_init 0x0c08 0x0f1b
-ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
-
-script interface/calao-usb-a9260.cfg
-script target/at91sam9260minimal.cfg

-----------------------------------------------------------------------

Summary of changes:
 .../jtagkey2p.cfg => board/calao-usb-a9260.cfg}    | 15 +++++++-------
 tcl/interface/calao-usb-a9260.cfg                  | 12 -----------
 tcl/interface/ftdi/calao-usb-a9260-c01.cfg         | 24 ----------------------
 tcl/interface/ftdi/calao-usb-a9260-c02.cfg         | 24 ----------------------
 4 files changed, 7 insertions(+), 68 deletions(-)
 copy tcl/{interface/ftdi/jtagkey2p.cfg => board/calao-usb-a9260.cfg} (53%)
 delete mode 100644 tcl/interface/calao-usb-a9260.cfg
 delete mode 100644 tcl/interface/ftdi/calao-usb-a9260-c01.cfg
 delete mode 100644 tcl/interface/ftdi/calao-usb-a9260-c02.cfg


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-130-ge9a7221b6

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  e9a7221b68d0775d9c96c8a12a7a26e2729caf37 (commit)
      from  12b405a4ac3dddd18e2fd822e135bb783cae0236 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e9a7221b68d0775d9c96c8a12a7a26e2729caf37
Author: Antonio Borneo <bor...@gm...>
Date:   Tue Dec 20 00:11:41 2022 +0100

    target: rewrite command 'target smp' as COMMAND_HANDLER
    
    This also fixes an incorrect return ERROR_xx from a jim command,
    propagated from return value of rtos_smp_init().
    
    Change-Id: Icf4893c00aabd8fadd60077c5e8a2e926f687518
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7511
    Tested-by: jenkins

diff --git a/src/target/target.c b/src/target/target.c
index 3fdb34ec6..47abd2823 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -6404,9 +6404,8 @@ COMMAND_HANDLER(handle_target_names)
 
 static struct target_list *
 __attribute__((warn_unused_result))
-create_target_list_node(Jim_Obj *const name) {
-	int len;
-	const char *targetname = Jim_GetString(name, &len);
+create_target_list_node(const char *targetname)
+{
 	struct target *target = get_target(targetname);
 	LOG_DEBUG("%s ", targetname);
 	if (!target)
@@ -6422,7 +6421,8 @@ create_target_list_node(Jim_Obj *const name) {
 	return new;
 }
 
-static int get_target_with_common_rtos_type(struct list_head *lh, struct target **result)
+static int get_target_with_common_rtos_type(struct command_invocation *cmd,
+	struct list_head *lh, struct target **result)
 {
 	struct target *target = NULL;
 	struct target_list *curr;
@@ -6430,39 +6430,39 @@ static int get_target_with_common_rtos_type(struct list_head *lh, struct target
 		struct rtos *curr_rtos = curr->target->rtos;
 		if (curr_rtos) {
 			if (target && target->rtos && target->rtos->type != curr_rtos->type) {
-				LOG_ERROR("Different rtos types in members of one smp target!");
-				return JIM_ERR;
+				command_print(cmd, "Different rtos types in members of one smp target!");
+				return ERROR_FAIL;
 			}
 			target = curr->target;
 		}
 	}
 	*result = target;
-	return JIM_OK;
+	return ERROR_OK;
 }
 
-static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+COMMAND_HANDLER(handle_target_smp)
 {
 	static int smp_group = 1;
 
-	if (argc == 1) {
+	if (CMD_ARGC == 0) {
 		LOG_DEBUG("Empty SMP target");
-		return JIM_OK;
+		return ERROR_OK;
 	}
-	LOG_DEBUG("%d", argc);
-	/* argv[1] = target to associate in smp
-	 * argv[2] = target to associate in smp
-	 * argv[3] ...
+	LOG_DEBUG("%d", CMD_ARGC);
+	/* CMD_ARGC[0] = target to associate in smp
+	 * CMD_ARGC[1] = target to associate in smp
+	 * CMD_ARGC[2] ...
 	 */
 
 	struct list_head *lh = malloc(sizeof(*lh));
 	if (!lh) {
 		LOG_ERROR("Out of memory");
-		return JIM_ERR;
+		return ERROR_FAIL;
 	}
 	INIT_LIST_HEAD(lh);
 
-	for (int i = 1; i < argc; i++) {
-		struct target_list *new = create_target_list_node(argv[i]);
+	for (unsigned int i = 0; i < CMD_ARGC; i++) {
+		struct target_list *new = create_target_list_node(CMD_ARGV[i]);
 		if (new)
 			list_add_tail(&new->lh, lh);
 	}
@@ -6476,14 +6476,13 @@ static int jim_target_smp(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 	smp_group++;
 
 	struct target *rtos_target;
-	int retval = get_target_with_common_rtos_type(lh, &rtos_target);
-	if (retval == JIM_OK && rtos_target)
+	int retval = get_target_with_common_rtos_type(CMD, lh, &rtos_target);
+	if (retval == ERROR_OK && rtos_target)
 		retval = rtos_smp_init(rtos_target);
 
 	return retval;
 }
 
-
 static int jim_target_create(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
 {
 	struct jim_getopt_info goi;
@@ -6536,7 +6535,7 @@ static const struct command_registration target_subcommand_handlers[] = {
 	{
 		.name = "smp",
 		.mode = COMMAND_ANY,
-		.jim_handler = jim_target_smp,
+		.handler = handle_target_smp,
 		.usage = "targetname1 targetname2 ...",
 		.help = "gather several target in a smp list"
 	},

-----------------------------------------------------------------------

Summary of changes:
 src/target/target.c | 41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-129-g12b405a4a

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  12b405a4ac3dddd18e2fd822e135bb783cae0236 (commit)
       via  d9d698103e974b2a94c611864cccb92359509b7d (commit)
      from  26f457896c456c57a57719e484d055d444ba67ee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 12b405a4ac3dddd18e2fd822e135bb783cae0236
Author: Antonio Borneo <bor...@gm...>
Date:   Mon Dec 19 23:58:01 2022 +0100

    target: rewrite command 'target names' as COMMAND_HANDLER
    
    Print one entry per line.
    While there add the mandatory 'usage' field.
    
    Change-Id: Ia832684817f3bdbfa4cb943cd97e3f9fb2605902
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7510
    Tested-by: jenkins

diff --git a/src/target/target.c b/src/target/target.c
index b77a25a2a..3fdb34ec6 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -6388,20 +6388,18 @@ COMMAND_HANDLER(handle_target_types)
 	return ERROR_OK;
 }
 
-static int jim_target_names(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+COMMAND_HANDLER(handle_target_names)
 {
-	if (argc != 1) {
-		Jim_WrongNumArgs(interp, 1, argv, "Too many parameters");
-		return JIM_ERR;
-	}
-	Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0));
+	if (CMD_ARGC != 0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
 	struct target *target = all_targets;
 	while (target) {
-		Jim_ListAppendElement(interp, Jim_GetResult(interp),
-			Jim_NewStringObj(interp, target_name(target), -1));
+		command_print(CMD, "%s", target_name(target));
 		target = target->next;
 	}
-	return JIM_OK;
+
+	return ERROR_OK;
 }
 
 static struct target_list *
@@ -6531,8 +6529,9 @@ static const struct command_registration target_subcommand_handlers[] = {
 	{
 		.name = "names",
 		.mode = COMMAND_ANY,
-		.jim_handler = jim_target_names,
+		.handler = handle_target_names,
 		.help = "Returns the names of all targets as a list of strings",
+		.usage = "",
 	},
 	{
 		.name = "smp",

commit d9d698103e974b2a94c611864cccb92359509b7d
Author: Antonio Borneo <bor...@gm...>
Date:   Mon Dec 19 23:54:10 2022 +0100

    target: rewrite command 'target types' as COMMAND_HANDLER
    
    Print one entry per line.
    While there add the mandatory 'usage' field.
    
    Change-Id: I135556e12154e33fdbd0f71d89f6fe37c69813b7
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7509
    Tested-by: jenkins

diff --git a/src/target/target.c b/src/target/target.c
index ae5f74cbf..b77a25a2a 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -6377,18 +6377,15 @@ COMMAND_HANDLER(handle_target_current)
 	return ERROR_OK;
 }
 
-static int jim_target_types(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
+COMMAND_HANDLER(handle_target_types)
 {
-	if (argc != 1) {
-		Jim_WrongNumArgs(interp, 1, argv, "Too many parameters");
-		return JIM_ERR;
-	}
-	Jim_SetResult(interp, Jim_NewListObj(interp, NULL, 0));
-	for (unsigned x = 0; target_types[x]; x++) {
-		Jim_ListAppendElement(interp, Jim_GetResult(interp),
-			Jim_NewStringObj(interp, target_types[x]->name, -1));
-	}
-	return JIM_OK;
+	if (CMD_ARGC != 0)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	for (unsigned int x = 0; target_types[x]; x++)
+		command_print(CMD, "%s", target_types[x]->name);
+
+	return ERROR_OK;
 }
 
 static int jim_target_names(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
@@ -6526,9 +6523,10 @@ static const struct command_registration target_subcommand_handlers[] = {
 	{
 		.name = "types",
 		.mode = COMMAND_ANY,
-		.jim_handler = jim_target_types,
+		.handler = handle_target_types,
 		.help = "Returns the available target types as "
 				"a list of strings",
+		.usage = "",
 	},
 	{
 		.name = "names",

-----------------------------------------------------------------------

Summary of changes:
 src/target/target.c | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository