From dff21f9a90a6dd8cfda55b68077b24989ec5f56e Mon Sep 17 00:00:00 2001 From: zevorn Date: Sun, 24 Apr 2022 13:06:22 +0800 Subject: [PATCH 1/2] [fix](common/new_api): fix api of delete_breakpoint_by_addr --- common/cli/skyeye_new_api.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cli/skyeye_new_api.c b/common/cli/skyeye_new_api.c index b15d0c2b..ac345654 100644 --- a/common/cli/skyeye_new_api.c +++ b/common/cli/skyeye_new_api.c @@ -324,8 +324,8 @@ SkyEyeAPIRetST skyeye_delete_breakpoint_by_addr(char *cpuname, uint64_t address) if (0 != iface->delete_bp(core, (uint32_t)address)) { - output_errmsg(0xffffffff, ApiRet.errMsg, "Can't get %s %s iface!\n", "Call %s delete_bp iface Failed!\n", cpuname); - output_log(Warning_log, "Can't get %s %s iface!\n", "Call %s delete_bp iface Failed!\n", cpuname); + output_errmsg(0xffffffff, ApiRet.errMsg, "Call %s delete_bp iface Failed!\n", cpuname); + output_log(Warning_log, "Call %s delete_bp iface Failed!\n", cpuname); ApiRet.result = API_ERROR; return ApiRet; } -- Gitee From 2472ac3b84b00b7be8ff5d88de89fb43200a1b59 Mon Sep 17 00:00:00 2001 From: zevorn Date: Tue, 26 Apr 2022 11:45:02 +0800 Subject: [PATCH 2/2] [fix](common/new_api): fix api of set pc --- common/cli/skyeye_new_api.c | 12 ++++++++++-- common/include/skyeye_new_api.h | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/common/cli/skyeye_new_api.c b/common/cli/skyeye_new_api.c index ac345654..3702a351 100644 --- a/common/cli/skyeye_new_api.c +++ b/common/cli/skyeye_new_api.c @@ -2896,11 +2896,19 @@ SkyEyeAPIRetST skyeye_enable_device_work(char *device_name) *16.设置和获取CPU PC API接口 */ -SkyEyeAPIRetST skyeye_set_pc(char *cpu_name, unsigned int pc) +SkyEyeAPIRetST skyeye_set_pc(char *cpu_name, uint64_t pc) { SkyEyeAPIRetST ApiRet = {0}; - if (!WIN_setPC(cpu_name, pc)) + if (pc > 0xFFFFFFFFUL) + { + output_errmsg(0xffffffff, ApiRet.errMsg, "The address is out of the supported range!\n"); + output_log(Error_log, "The address is out of the supported range!\n"); + ApiRet.result = API_ERROR; + return ApiRet; + } + + if (!WIN_setPC(cpu_name, (uint32_t)pc)) { output_errmsg(0xffffffff, ApiRet.errMsg, "Call WIN_setPC iface failed!\n"); output_log(Error_log, "Call WIN_setPC iface failed!\n"); diff --git a/common/include/skyeye_new_api.h b/common/include/skyeye_new_api.h index 97cd5180..918f9253 100644 --- a/common/include/skyeye_new_api.h +++ b/common/include/skyeye_new_api.h @@ -221,7 +221,7 @@ SkyEyeAPIRetST skyeye_disable_device_work(char *device_name); SkyEyeAPIRetST skyeye_enable_device_work(char *device_name); /*úͻȡCPU PC APIӿ*/ -SkyEyeAPIRetST skyeye_set_pc(char *cpu_name, unsigned int pc); +SkyEyeAPIRetST skyeye_set_pc(char *cpu_name, uint64_t pc); SkyEyeAPIRetST skyeye_get_pc(char *cpu_name); /*enable SkyEye debug iface*/ -- Gitee