From dff21f9a90a6dd8cfda55b68077b24989ec5f56e Mon Sep 17 00:00:00 2001 From: zevorn Date: Sun, 24 Apr 2022 13:06:22 +0800 Subject: [PATCH 1/6] [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/6] [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 From b82c1d384ced1f31d3bf92b71f070191849a29ab Mon Sep 17 00:00:00 2001 From: zevorn Date: Thu, 28 Apr 2022 11:28:52 +0800 Subject: [PATCH 3/6] [fix](utils/pycli): update welcom message --- utils/pycli/skyeye_cli.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/pycli/skyeye_cli.py b/utils/pycli/skyeye_cli.py index ecfc2244..3a8ac20b 100755 --- a/utils/pycli/skyeye_cli.py +++ b/utils/pycli/skyeye_cli.py @@ -1539,5 +1539,5 @@ def welcome_message(): except: version = "unknown" date = "unknown" - welcome_message = "SkyEye %s Copyright 2010-2022 Digiproto Corporation\n" % (version, date, system) + welcome_message = "Open-SkyEye %s Copyright 2010-2022 Digiproto Corporation\n" % (version, date, system) print(welcome_message) -- Gitee From 931a054506d2745fba9a7bd499bbeb30f9294f8e Mon Sep 17 00:00:00 2001 From: zevorn Date: Sun, 15 May 2022 18:23:36 +0800 Subject: [PATCH 4/6] [fix](utils/pycli): update welcom message --- utils/pycli/skyeye_cli.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/utils/pycli/skyeye_cli.py b/utils/pycli/skyeye_cli.py index aaf16757..adae7727 100755 --- a/utils/pycli/skyeye_cli.py +++ b/utils/pycli/skyeye_cli.py @@ -232,8 +232,6 @@ class SkyEyeCli(cmd.Cmd): # except Exception as e: # print(e) # raise e -<<<<<<< HEAD - ################################################################################ # util func def convert_int(x): @@ -262,5 +260,3 @@ def welcome_message(): date = "unknown" welcome_message = "Open-SkyEye %s Copyright 2010-2022 Digiproto Corporation\n" % (version, date, system) print(welcome_message) -======= ->>>>>>> f309389f27493733ca20e4eb23a3a9a28e898821 -- Gitee From aac78ae6eeed099a301ab0b15ad8782e5c5f8cdf Mon Sep 17 00:00:00 2001 From: zevorn Date: Sun, 15 May 2022 19:19:25 +0800 Subject: [PATCH 5/6] [fix](utils/pycli): update welcom message --- utils/pycli/skyeye_cli.py | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/utils/pycli/skyeye_cli.py b/utils/pycli/skyeye_cli.py index adae7727..0a1b6855 100755 --- a/utils/pycli/skyeye_cli.py +++ b/utils/pycli/skyeye_cli.py @@ -125,7 +125,7 @@ class SkyEyeCli(cmd.Cmd): except: version = "unknown" date = "unknown" - welcome_message = "SkyEye %s Copyright 2010-2022 Digiproto Corporation\n" % (version, date, system) + welcome_message = "Open-SkyEye %s Copyright 2010-2022 Digiproto Corporation\n" % (version, date, system) print(welcome_message) def readline_cfg(self): @@ -231,32 +231,4 @@ class SkyEyeCli(cmd.Cmd): # print(res) # except Exception as e: # print(e) - # raise e -################################################################################ -# util func -def convert_int(x): - return int(x, 0) -convert_int.__name__ = 'int' - -def table_print(l): - COL_NUM = 5 - ITEM_WIDTH = 20 - for i in range(0, len(l), COL_NUM): - print(' '.join([item.ljust(ITEM_WIDTH) for item in l[i:i+COL_NUM]])) - -def welcome_message(): - os_info = platform.system() - if operator.eq(os_info, "Linux"): - system = "Linux" - else: - system = "Windows" - - try: - config = tools.GetPackageConfig() - version = tools.GetBuildVersion(config) - date = tools.GetBuildDate(config) - except: - version = "unknown" - date = "unknown" - welcome_message = "Open-SkyEye %s Copyright 2010-2022 Digiproto Corporation\n" % (version, date, system) - print(welcome_message) + # raise e \ No newline at end of file -- Gitee From 57f6bc5fd730b8c522bb3fd8ffecc7a04fb1c3a9 Mon Sep 17 00:00:00 2001 From: zevorn Date: Sun, 15 May 2022 19:28:23 +0800 Subject: [PATCH 6/6] [fix](utils/pycli): update welcom message --- utils/pycli/skyeye_cli.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/pycli/skyeye_cli.py b/utils/pycli/skyeye_cli.py index 0a1b6855..22e89551 100755 --- a/utils/pycli/skyeye_cli.py +++ b/utils/pycli/skyeye_cli.py @@ -231,4 +231,5 @@ class SkyEyeCli(cmd.Cmd): # print(res) # except Exception as e: # print(e) - # raise e \ No newline at end of file + # raise e + \ No newline at end of file -- Gitee