Merge pull request #5 from kendryte/dev

[Release] v0.2.2
kendryte · Jan 17, 2019 · 9e5700d · 9e5700d
2 parents f4d3ecf + eb862f2
commit 9e5700d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Also you can get them on Kendryte website: https://kendryte.com
 
 ## Configuration for K210
 
-We have provided a template configuration for JLink in `tcl/kendryte.cfg`, if you are using other JTAG devices, please modify it yourself.
+We have provided a template configuration for J-Link in `tcl/kendryte.cfg`, if you are using other JTAG emulators, please modify it yourself.
 
 ## Compiling and build
 

diff --git a/src/openocd.c b/src/openocd.c
@@ -60,7 +60,7 @@
 	"| . \\  __/ | | | (_| | |  | |_| | ||  __/ \n" \
 	"|_|\\_\\___|_| |_|\\__,_|_|   \\__, |\\__\\___| \n" \
 	"                           |___/          \n" \
-	"Kendryte Open On-Chip Debugger For RISC-V v0.2.1 (2019-01-09)"
+	"Kendryte Open On-Chip Debugger For RISC-V v0.2.2 (2019-01-17)"
 
 static const char openocd_startup_tcl[] = {
 #include "startup_tcl.inc"

diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
@@ -736,27 +736,30 @@ static int old_or_new_riscv_resume(
 		return riscv_openocd_resume(target, current, address, handle_breakpoints, debug_execution);
 }
 
-static void riscv_select_current_hart(struct target *target)
+static int riscv_read_buffer(struct target *target, target_addr_t address,
+		uint32_t size, uint8_t *buffer)
 {
-	RISCV_INFO(r);
-	if (r->rtos_hartid != -1 && riscv_rtos_enabled(target))
-		riscv_set_current_hartid(target, r->rtos_hartid);
-	else
-		riscv_set_current_hartid(target, target->coreid);
+	struct target_type *tt = get_target_type(target);
+	return tt->read_memory(target, address, 4, size / 4 , buffer);
+}
+
+static int riscv_write_buffer(struct target *target, target_addr_t address,
+		uint32_t size, const uint8_t *buffer)
+{
+	struct target_type *tt = get_target_type(target);
+	return tt->write_memory(target, address, 4, size / 4, buffer);
 }
 
 static int riscv_read_memory(struct target *target, target_addr_t address,
 		uint32_t size, uint32_t count, uint8_t *buffer)
 {
-	//riscv_select_current_hart(target);
 	struct target_type *tt = get_target_type(target);
 	return tt->read_memory(target, address, size, count, buffer);
 }
 
 static int riscv_write_memory(struct target *target, target_addr_t address,
 		uint32_t size, uint32_t count, const uint8_t *buffer)
 {
-	//riscv_select_current_hart(target);
 	struct target_type *tt = get_target_type(target);
 	return tt->write_memory(target, address, size, count, buffer);
 }
@@ -768,11 +771,10 @@ static int riscv_get_gdb_reg_list(struct target *target,
 	RISCV_INFO(r);
 	KENDRYTE_LOG_D("hartid:%d, type:%s", r->current_hartid, reg_class == REG_CLASS_GENERAL ? "general" : "all");
 
-	/*if (!r->is_halted(target))
+	if (!r->is_halted(target))
 	{
-        LOG_INFO("target is not halted, halt all hart");
 		r->halt_all_hart(target);
-	}*/
+	}
 
 	LOG_DEBUG("reg_class=%d", reg_class);
 	LOG_DEBUG("rtos_hartid=%d current_hartid=%d", r->rtos_hartid, r->current_hartid);
@@ -1139,6 +1141,7 @@ int riscv_openocd_step(
 	return out;
 }
 
+
 /* Command Handlers */
 COMMAND_HANDLER(riscv_set_command_timeout_sec)
 {
@@ -1343,6 +1346,9 @@ struct target_type riscv_target = {
 	.assert_reset = riscv_assert_reset,
 	.deassert_reset = riscv_deassert_reset,
 
+	.read_buffer = riscv_read_buffer,
+	.write_buffer = riscv_write_buffer,
+
 	.read_memory = riscv_read_memory,
 	.write_memory = riscv_write_memory,
 
@@ -1580,7 +1586,7 @@ int riscv_set_register_on_hart(struct target *target, int hartid,
 		enum gdb_regno regid, uint64_t value)
 {
 	RISCV_INFO(r);
-	//LOG_INFO("[%d] %s <- %" PRIx64, hartid, gdb_regno_name(regid), value);
+	LOG_DEBUG("[%d] %s <- %" PRIx64, hartid, gdb_regno_name(regid), value);
 	assert(r->set_register);
 	return r->set_register(target, hartid, regid, value);
 }
@@ -1597,7 +1603,7 @@ int riscv_get_register_on_hart(struct target *target, riscv_reg_t *value,
 {
 	RISCV_INFO(r);
 	int result = r->get_register(target, value, hartid, regid);
-	//LOG_INFO("[%d] %s: %" PRIx64, hartid, gdb_regno_name(regid), *value);
+	LOG_DEBUG("[%d] %s: %" PRIx64, hartid, gdb_regno_name(regid), *value);
 	return result;
 }