From eb5ff77a9caec6b86baebced72f93521924481ba Mon Sep 17 00:00:00 2001 From: Liu Shuo Date: Wed, 20 Apr 2022 19:41:08 +0800 Subject: [PATCH] [fix] python API change 32bit address to 64bit address --- utils/pycli/skyeye_common_module.py | 33 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/utils/pycli/skyeye_common_module.py b/utils/pycli/skyeye_common_module.py index 60dab2f3..79b83ca0 100644 --- a/utils/pycli/skyeye_common_module.py +++ b/utils/pycli/skyeye_common_module.py @@ -277,7 +277,7 @@ def SkyEyeDeleteBreakpointByAddr(corename, addr): def _SkyEyeDeleteBreakpointByAddr(corename, addr): return libcommon.skyeye_delete_breakpoint_by_addr(corename.encode("utf-8"), addr) libcommon.skyeye_delete_breakpoint_by_addr.restype = SkyeyeAPIResult -libcommon.skyeye_delete_breakpoint_by_addr.argtypes = [c_char_p, c_int] +libcommon.skyeye_delete_breakpoint_by_addr.argtypes = [c_char_p, c_uint64] def SkyEyeGetBpNumbers(corename): c_ret = _SkyEyeGetBpNumbers(corename) @@ -303,8 +303,7 @@ libcommon.skyeye_check_bp_hit.restype = SkyeyeAPIResult libcommon.skyeye_check_bp_hit.argtypes = [c_char_p] def SkyEyeCreateBreakpoint(corename, addr): - # BUG 1: 32位以上地址被截断，没有报错。 - # BUG 2: 相同bp地址， 未报错。 + # BUG: 相同bp地址， 未报错。 c_ret = _SkyEyeCreateBreakpoint(corename, addr) return None @@ -314,7 +313,7 @@ def _SkyEyeCreateBreakpoint(corename, addr): #debug_clib_result(c_ret) return c_ret libcommon.skyeye_create_breakpoint.restype = SkyeyeAPIResult -libcommon.skyeye_create_breakpoint.argtypes = [c_char_p, c_int] +libcommon.skyeye_create_breakpoint.argtypes = [c_char_p, c_uint64] def SkyEyeGetSocNum(): c_ret = _SkyEyeGetSocNum() @@ -588,7 +587,7 @@ def _SkyEyeLoadFile(cpuname, filename, pc_addr): c_ret = libcommon.skyeye_load_file(cpuname.encode("utf-8"), filename.encode("utf-8"), pc_addr) return c_ret libcommon.skyeye_load_file.restype = SkyeyeAPIResult -libcommon.skyeye_load_file.argtypes = [c_char_p, c_char_p, c_uint] +libcommon.skyeye_load_file.argtypes = [c_char_p, c_char_p, c_uint64] def SkyEyeGetDevRegNum(machname, devicename): c_ret = _SkyEyeGetDevRegNum(machname, devicename) @@ -668,7 +667,7 @@ def _SkyEyeDisassemble(cpuname, addr): c_ret = libcommon.skyeye_disassemble_by_addr(cpuname.encode("utf-8"), addr) return c_ret libcommon.skyeye_disassemble_by_addr.restype = SkyeyeAPIResult -libcommon.skyeye_disassemble_by_addr.argtypes = [c_char_p, c_uint] +libcommon.skyeye_disassemble_by_addr.argtypes = [c_char_p, c_uint64] def SkyEyeReadMemory8(cpuname, addr): # FIXME: 地址越界 @@ -680,7 +679,7 @@ def _SkyEyeReadMemory8(cpuname, addr): c_ret = libcommon.skyeye_memory_read(cpuname.encode("utf-8"), addr, 1) return c_ret libcommon.skyeye_memory_read.restype = SkyeyeAPIResult -libcommon.skyeye_memory_read.argtypes = [c_char_p, c_uint, c_uint] +libcommon.skyeye_memory_read.argtypes = [c_char_p, c_uint64, c_uint] def SkyEyeWriteMemory(cpuname,addr,value,length): c_ret =_SkyEyeWriteMemory(cpuname,addr,value,length) @@ -691,7 +690,7 @@ def _SkyEyeWriteMemory(cpuname,addr,value,length): c_ret = libcommon.skyeye_memory_write(cpuname.encode("utf-8"), addr, value.encode('latin1'), length) return c_ret libcommon.skyeye_memory_write.restype = SkyeyeAPIResult -libcommon.skyeye_memory_write.argtypes = [c_char_p, c_uint, c_char_p, c_uint] +libcommon.skyeye_memory_write.argtypes = [c_char_p, c_uint64, c_char_p, c_uint] def SkyEyeGetAddressWidth(cpuname): c_ret = _SkyEyeGetAddressWidth(cpuname) @@ -843,7 +842,7 @@ def _SkyEyeSetFj(mp, addr, bit, mode, count): c_ret = libcommon.skyeye_set_fault(mp.encode("utf-8"), addr, bit, mode, count) return c_ret libcommon.skyeye_set_fault.restype = SkyeyeAPIResult -libcommon.skyeye_set_fault.argtypes = [c_char_p, c_uint, c_uint, c_uint, c_uint] +libcommon.skyeye_set_fault.argtypes = [c_char_p, c_uint64, c_uint, c_uint, c_uint] def SkyEyeGetFj(mp, addr): c_ret = _SkyEyeGetFj(mp, addr) @@ -864,7 +863,7 @@ def _SkyEyeGetFj(mp, addr): c_ret = libcommon.skyeye_get_fault(mp.encode("utf-8"), addr) return c_ret libcommon.skyeye_get_fault.restype = SkyeyeAPIResult -libcommon.skyeye_get_fault.argtypes = [c_char_p, c_uint] +libcommon.skyeye_get_fault.argtypes = [c_char_p, c_uint64] def SkyEyeClearFj(mp, addr, bit, mode): c_ret = _SkyEyeClearFj(mp, addr, bit, mode) @@ -875,7 +874,7 @@ def _SkyEyeClearFj(mp, addr, bit, mode): c_ret = libcommon.skyeye_clear_fault(mp.encode("utf-8"), addr, bit, mode) return c_ret libcommon.skyeye_clear_fault.restype = SkyeyeAPIResult -libcommon.skyeye_clear_fault.argtypes = [c_char_p, c_uint, c_uint, c_uint] +libcommon.skyeye_clear_fault.argtypes = [c_char_p, c_uint64, c_uint, c_uint] def SkyEyeLoadBinary(cpuname, filename): c_ret = _SkyEyeLoadBinary(cpuname, filename) @@ -1214,7 +1213,7 @@ def _SkyEyeLoadBinBinary(cpuname, filename, addr, length, start_pc): c_ret = libcommon.skyeye_load_bin_binary(cpuname.encode("utf-8"), filename.encode("utf-8"), addr, length, start_pc) return c_ret libcommon.skyeye_load_bin_binary.restype = SkyeyeAPIResult -libcommon.skyeye_load_bin_binary.argtypes = [c_char_p, c_char_p, c_uint, c_uint, c_uint] +libcommon.skyeye_load_bin_binary.argtypes = [c_char_p, c_char_p, c_uint64, c_uint, c_uint] def SkyEyeGetCpuFreq(cpuname): c_ret = _SkyEyeGetCpuFreq(cpuname) @@ -1236,7 +1235,7 @@ def _SkyEyeReadByte(cpuname,addr): c_ret = libcommon.skyeye_memory_read(cpuname.encode("utf-8"), addr, 1) return c_ret libcommon.skyeye_memory_read.restype = SkyeyeAPIResult -libcommon.skyeye_memory_read.argtypes = [c_char_p, c_int, c_uint] +libcommon.skyeye_memory_read.argtypes = [c_char_p, c_uint64, c_uint] def SkyEyeReadDWord(cpuname,addr): c_ret = _SkyEyeReadDWord(cpuname,addr) @@ -1247,7 +1246,7 @@ def _SkyEyeReadDWord(cpuname,addr): c_ret = libcommon.skyeye_memory_read(cpuname.encode("utf-8"),addr, 4) return c_ret libcommon.skyeye_memory_read.restype = SkyeyeAPIResult -libcommon.skyeye_memory_read.argtypes = [c_char_p, c_int, c_uint] +libcommon.skyeye_memory_read.argtypes = [c_char_p, c_uint64, c_uint] def SkyEyeWriteByte(cpuname,addr,value): c_ret = _SkyEyeWriteByte(cpuname,addr,value) @@ -1258,7 +1257,7 @@ def _SkyEyeWriteByte(cpuname,addr,value): c_ret = libcommon.skyeye_memory_write(cpuname.encode("utf-8"),addr,cast(pointer(c_int(value)),c_char_p), 1) return c_ret libcommon.skyeye_memory_write.restype = SkyeyeAPIResult -libcommon.skyeye_memory_write.argtypes = [c_char_p, c_int, c_char_p, c_uint] +libcommon.skyeye_memory_write.argtypes = [c_char_p, c_uint64, c_char_p, c_uint] def SkyEyeWriteDWord(cpuname,addr,value): c_ret = _SkyEyeWriteDWord(cpuname,addr,value) @@ -1269,7 +1268,7 @@ def _SkyEyeWriteDWord(cpuname,addr,value): c_ret = libcommon.skyeye_memory_write(cpuname.encode("utf-8"),addr,cast(pointer(c_int(value)),c_char_p), 4) return c_ret libcommon.skyeye_memory_write.restype = SkyeyeAPIResult -libcommon.skyeye_memory_write.argtypes = [c_char_p, c_int, c_char_p, c_uint] +libcommon.skyeye_memory_write.argtypes = [c_char_p, c_uint64, c_char_p, c_uint] def SkyEyeGetFuncAddr(cpuname,funcname): c_ret = _SkyEyeGetFuncAddr(cpuname,funcname) @@ -1434,7 +1433,7 @@ def _SkyEyeNewLoadFile(memoryname, filename, pc_addr): c_ret = libcommon.skyeye_new_load_file(memoryname.encode("utf-8"), filename.encode("utf-8"), pc_addr) return c_ret libcommon.skyeye_new_load_file.restype = SkyeyeAPIResult -libcommon.skyeye_new_load_file.argtypes = [c_char_p, c_char_p, c_uint] +libcommon.skyeye_new_load_file.argtypes = [c_char_p, c_char_p, c_uint64] def SkyEyeTermWaitForString(termname, string): c_ret = _SkyEyeTermWaitForString(termname, string) -- Gitee