X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Fhla_target.c;h=1a95d8808bc6c29f7e031284d5f96866f2944482;hp=272c25e0526302a29ee322f91363f01d347da384;hb=3eb7d77601b268ac50f9efd152409e1e7a1d83c7;hpb=6c467da586a42c8b1332670f2d5f27ae360a153f

diff --git a/src/target/hla_target.c b/src/target/hla_target.c
index 272c25e052..1a95d8808b 100644
--- a/src/target/hla_target.c
+++ b/src/target/hla_target.c
@@ -339,7 +339,7 @@ static int adapter_debug_entry(struct target *target)
 	adapter_load_context(target);
 
 	/* make sure we clear the vector catch bit */
-	adapter->layout->api->write_debug_reg(adapter->fd, DCB_DEMCR, 0);
+	adapter->layout->api->write_debug_reg(adapter->fd, DCB_DEMCR, TRCENA);
 
 	r = armv7m->core_cache->reg_list + ARMV7M_xPSR;
 	xPSR = buf_get_u32(r->value, 0, 32);
@@ -434,9 +434,9 @@ static int adapter_assert_reset(struct target *target)
 
 	/* only set vector catch if halt is requested */
 	if (target->reset_halt)
-		adapter->layout->api->write_debug_reg(adapter->fd, DCB_DEMCR, VC_CORERESET);
+		adapter->layout->api->write_debug_reg(adapter->fd, DCB_DEMCR, TRCENA|VC_CORERESET);
 	else
-		adapter->layout->api->write_debug_reg(adapter->fd, DCB_DEMCR, 0);
+		adapter->layout->api->write_debug_reg(adapter->fd, DCB_DEMCR, TRCENA);
 
 	if (jtag_reset_config & RESET_HAS_SRST) {
 		if (!srst_asserted) {
@@ -551,6 +551,12 @@ static int adapter_resume(struct target *target, int current,
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
+	if (!debug_execution) {
+		target_free_all_working_areas(target);
+		cortex_m3_enable_breakpoints(target);
+		cortex_m3_enable_watchpoints(target);
+	}
+
 	pc = armv7m->arm.pc;
 	if (!current) {
 		buf_set_u32(pc->value, 0, 32, address);
@@ -565,6 +571,11 @@ static int adapter_resume(struct target *target, int current,
 
 	resume_pc = buf_get_u32(pc->value, 0, 32);
 
+	/* write any user vector flags */
+	res = target_write_u32(target, DCB_DEMCR, TRCENA | armv7m->demcr);
+	if (res != ERROR_OK)
+		return res;
+
 	armv7m_restore_context(target);
 
 	/* registers are now invalid */
@@ -665,11 +676,11 @@ static int adapter_read_memory(struct target *target, uint32_t address,
 		uint32_t size, uint32_t count,
 		uint8_t *buffer)
 {
+	struct hl_interface_s *adapter = target_to_adapter(target);
 	int res;
-	uint32_t buffer_threshold = 128;
+	uint32_t buffer_threshold = (adapter->param.max_buffer / 4);
 	uint32_t addr_increment = 4;
 	uint32_t c;
-	struct hl_interface_s *adapter = target_to_adapter(target);
 
 	if (!count || !buffer)
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -681,7 +692,7 @@ static int adapter_read_memory(struct target *target, uint32_t address,
 	 */
 	if (size != 4) {
 		count *= size;
-		buffer_threshold = 64;
+		buffer_threshold = (adapter->param.max_buffer / 4) / 2;
 		addr_increment = 1;
 	}
 
@@ -713,11 +724,11 @@ static int adapter_write_memory(struct target *target, uint32_t address,
 		uint32_t size, uint32_t count,
 		const uint8_t *buffer)
 {
+	struct hl_interface_s *adapter = target_to_adapter(target);
 	int res;
-	uint32_t buffer_threshold = 128;
+	uint32_t buffer_threshold = (adapter->param.max_buffer / 4);
 	uint32_t addr_increment = 4;
 	uint32_t c;
-	struct hl_interface_s *adapter = target_to_adapter(target);
 
 	if (!count || !buffer)
 		return ERROR_COMMAND_SYNTAX_ERROR;
@@ -729,7 +740,7 @@ static int adapter_write_memory(struct target *target, uint32_t address,
 	 */
 	if (size != 4) {
 		count *= size;
-		buffer_threshold = 64;
+		buffer_threshold = (adapter->param.max_buffer / 4) / 2;
 		addr_increment = 1;
 	}