skyeye-sdk-js 1.3.4 → 1.3.5

package/dist/src/RequestFactory.d.ts

@@ -11,6 +11,7 @@ export declare class RequestFactory {
     quitCommand(): JSONRequest;
     getCpuList(): JSONRequest;
     getMemoryValue(cpuName: string, baseAddr: string, length: string): JSONRequest;
+    setMemoryValue(cpuName: string, baseAddr: string, value: string, length: string): JSONRequest;
     enableDeviceWork(deviceName: string): JSONRequest;
     disableDeviceWork(deviceName: string): JSONRequest;
     changeDir(path: string): JSONRequest;
@@ -20,7 +21,7 @@ export declare class RequestFactory {
     getCurrentPC(cpuName: string): JSONRequest;
     getCpuMips(cpuName: string): JSONRequest;
     getGlobalVarValue(cpuName: string, varName: string, bytesNum: number, valueType: GlobalVarType): JSONRequest;
-    setGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType, value: string): JSONRequest;
+    setGlobalVarValue(cpuName: string, varName: string, bytesNum: number, valueType: GlobalVarType, value: string): JSONRequest;
     getDeviceList(): JSONRequest;
     getDeviceTree(): JSONRequest;
     setRegisterValue(machName: string, deviceName: string, regName: string, value: string): JSONRequest;

package/dist/src/RequestFactory.js

@@ -60,6 +60,19 @@ class RequestFactory {
         request.setRequest(baseRequest.toJSONString());
         return request;
     }
+    setMemoryValue(cpuName, baseAddr, value, length) {
+        const baseRequest = new BaseRequest_1.BaseRequest("SE_set_memory_value");
+        const args = {};
+        args.cpuname = cpuName;
+        args.baseaddr = "0x" + baseAddr;
+        args.value = value;
+        args.length = length;
+        baseRequest.setArgs(args);
+        const request = new skyeye_rpc_pb_1.JSONRequest();
+        request.setRequest(baseRequest.toJSONString());
+        console.log("setMemoryValue:", request);
+        return request;
+    }
     enableDeviceWork(deviceName) {
         const baseRequest = new BaseRequest_1.BaseRequest("SE_enable_device_work");
         const args = {};
@@ -145,12 +158,13 @@ class RequestFactory {
         const args = {};
         args.cpu_name = cpuName;
         args.var_name = varName;
-        args.value_bytes_number = String(bytesNum);
+        args.value_bytes_number = bytesNum;
         args.value_type = valueType;
         args.value = value;
         baseRequest.setArgs(args);
         const request = new skyeye_rpc_pb_1.JSONRequest();
         request.setRequest(baseRequest.toJSONString());
+        console.log('setGlobalVarValue:', request);
         return request;
     }
     getDeviceList() {

package/dist/src/SkyEyeClient.d.ts

@@ -42,12 +42,14 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
     getCurrentCpuMips(): Promise<any>;
     getGlobalVarValue(cpuName: string, varName: string, bytesNum: number, valueType: GlobalVarType): Promise<any>;
     getGlobalVarValueDefault(varName: string, valueType: GlobalVarType): Promise<any>;
-    setGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType, value: string): Promise<any>;
+    setGlobalVarValue(cpuName: string, varName: string, bytesNum: number, valueType: GlobalVarType, value: string): Promise<any>;
     setGlobalVarValueDefault(varName: string, valueType: GlobalVarType, value: string): Promise<any>;
-    getMemoryValue(cpuName: string, baseAddr: string, length: string): Promise<any>;
     getAddressingSpace(cpuName: string, baseAddr: string, length: string): Promise<any>;
+    getMemoryValue(cpuName: string, baseAddr: string, length: string): Promise<any>;
     getMemoryValueDefault(baseAddr: string, length: string): Promise<any>;
     getAddressingSpaceDefault(baseAddr: string, length: string): Promise<any>;
+    setMemoryValue(cpuName: string, baseAddr: string, value: string, length: string): Promise<any>;
+    setMemoryValueDefault(baseAddr: string, value: string, length: string): Promise<any>;
     getCpuRegisters(cpuName: string): Promise<GetCpuRegisterInfoResponse>;
     getCpuRegistersDefault(): Promise<GetCpuRegisterInfoResponse>;
     setCpuRegisterValueDefault(register: Register, value: string): Promise<any>;

package/dist/src/SkyEyeClient.js

@@ -465,7 +465,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             const cpuList = (yield this.getCpuList()).getCpuList();
             if (cpuList != null && cpuList.length > 0) {
                 try {
-                    return yield this.call(RequestFactory_1.RequestFactory.getInstance().setGlobalVarValue(cpuList[0].getName(), varName, "4", valueType, value));
+                    return yield this.call(RequestFactory_1.RequestFactory.getInstance().setGlobalVarValue(cpuList[0].getName(), varName, 8, valueType, value));
                 }
                 catch (error) {
                     console.error("Error during setGlobalVarValueDefault:", error);
@@ -478,24 +478,24 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             }
         });
     }
-    getMemoryValue(cpuName, baseAddr, length) {
+    getAddressingSpace(cpuName, baseAddr, length) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return this.getAddressingSpace(cpuName, baseAddr, length);
+                return yield this.call(RequestFactory_1.RequestFactory.getInstance().getMemoryValue(cpuName, baseAddr, length));
             }
             catch (error) {
-                console.error("Error during getMemoryValue:", error);
+                console.error("Error during getAddressingSpace:", error);
                 throw error;
             }
         });
     }
-    getAddressingSpace(cpuName, baseAddr, length) {
+    getMemoryValue(cpuName, baseAddr, length) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                return yield this.call(RequestFactory_1.RequestFactory.getInstance().getMemoryValue(cpuName, baseAddr, length));
+                return this.getAddressingSpace(cpuName, baseAddr, length);
             }
             catch (error) {
-                console.error("Error during getAddressingSpace:", error);
+                console.error("Error during getMemoryValue:", error);
                 throw error;
             }
         });
@@ -529,6 +529,35 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
             }
         });
     }
+    setMemoryValue(cpuName, baseAddr, value, length) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                return yield this.call(RequestFactory_1.RequestFactory.getInstance().setMemoryValue(cpuName, baseAddr, value, length));
+            }
+            catch (error) {
+                console.error("Error during getAddressingSpaceDefault:", error);
+                throw error;
+            }
+        });
+    }
+    setMemoryValueDefault(baseAddr, value, length) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cpuList = (yield this.getCpuList()).getCpuList();
+            if (cpuList != null && cpuList.length > 0) {
+                try {
+                    return yield this.setMemoryValue(cpuList[0].getName(), baseAddr, value, length);
+                }
+                catch (error) {
+                    console.error("Error during getAddressingSpaceDefault:", error);
+                    throw error;
+                }
+            }
+            else {
+                console.error("无法获取cpu，请确认cpu是否存在:");
+                throw new SkyEyeSDKException_1.SkyEyeSDKException("无法获取cpu，请确认cpu是否存在:");
+            }
+        });
+    }
     getCpuRegisters(cpuName) {
         return __awaiter(this, void 0, void 0, function* () {
             const response = new GetCpuRegisterInfoResponse_1.GetCpuRegisterInfoResponse();

package/dist/test.js

@@ -203,13 +203,15 @@ function test() {
         // const port = "50051"
         // const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', '50051');
         // await client.initSkyEyeAndRun2(pathSkyEye, fileName, port, skyeyeDir)
-        const pathSkyEye = "D:/data/case/workspace_c6713/targets/c6713_fc_1553b";
-        const fileName = "c6713_fc_1553b.skyeye";
-        const skyeyeDir = "D:/install/skyeye/opt/skyeye/bin/skyeye.exe";
+        // const pathSkyEye = "D:/data/case/workspace_c6713/targets/c6713_fc_1553b";
+        // const fileName = "c6713_fc_1553b.skyeye";
+        // const skyeyeDir = "D:/install/skyeye/opt/skyeye/bin/skyeye.exe"
         const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', '50051');
         // const response =await  client.getCurrentRunningState()
         // const response = await client.getMemoryValueDefault("128","4")
-        const response = yield client.getGlobalVarValueDefault("number_b", "int");
+        const response = yield client.getGlobalVarValueDefault("number_a", "int");
+        // const response = await client.setGlobalVarValueDefault("number_a", "int", "12")
+        // const response = await client.getMemoryValueDefault("10001", "1")
         console.log("response:", response);
         //启动多个skyeye
         // const count = 5;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "skyeye-sdk-js",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "gRPC to SkyEye",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,6 +27,7 @@
     "google-protobuf": "^3.21.2",
     "lodash": "^4.6.1",
     "minimist": "^1.2.0",
-    "protobufjs": "^7.2.6"
+    "protobufjs": "^7.2.6",
+    "skyeye-sdk-js": "^1.3.2"
   }
 }

package/src/RequestFactory.ts

@@ -73,6 +73,21 @@ export class RequestFactory {
         request.setRequest(baseRequest.toJSONString());
         return request;
     }
+    public setMemoryValue(cpuName: string, baseAddr: string, value: string, length: string) {
+        const baseRequest = new BaseRequest("SE_set_memory_value");
+        const args: { [key: string]: string } = {};
+        args.cpuname = cpuName;
+        args.baseaddr = "0x" + baseAddr;
+        args.value = value;
+        args.length = length;
+        baseRequest.setArgs(args)
+        const request = new JSONRequest()
+        request.setRequest(baseRequest.toJSONString());
+        console.log("setMemoryValue:",request)
+        return request;
+    }
+
+
 
     public enableDeviceWork(deviceName: string) {
         const baseRequest = new BaseRequest("SE_enable_device_work");
@@ -163,22 +178,23 @@ export class RequestFactory {
         baseRequest.setArgs(args)
         const request = new JSONRequest()
         request.setRequest(baseRequest.toJSONString());
-        console.log("request:",request)
+        console.log("request:", request)
         return request;
     }
 
 
-    public setGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType, value: string) {
+    public setGlobalVarValue(cpuName: string, varName: string, bytesNum: number, valueType: GlobalVarType, value: string) {
         const baseRequest = new BaseRequest("SE_set_global_variable_value");
-        const args: { [key: string]: string } = {};
+        const args: { [key: string]: any } = {};
         args.cpu_name = cpuName;
         args.var_name = varName;
-        args.value_bytes_number = String(bytesNum);
+        args.value_bytes_number = bytesNum
         args.value_type = valueType;
         args.value = value;
         baseRequest.setArgs(args)
         const request = new JSONRequest()
         request.setRequest(baseRequest.toJSONString());
+        console.log('setGlobalVarValue:', request)
         return request;
     }
 
@@ -214,7 +230,7 @@ export class RequestFactory {
         return request;
     }
 
-    
+
     public getAllDeviceInfo() {
         const baseRequest = new BaseRequest("SE_get_all_fault_inject_device_info");
         const request = new JSONRequest()
@@ -223,7 +239,7 @@ export class RequestFactory {
     }
 
 
-    public getRamAddrInfo(machName:string,addr:string){
+    public getRamAddrInfo(machName: string, addr: string) {
         const baseRequest = new BaseRequest("SE_get_mem_device_addr_info");
         const args: { [key: string]: string } = {};
         args.machName = machName;
@@ -237,7 +253,7 @@ export class RequestFactory {
 
 
 
-    public setFaultInject(machName:string,deviceName:string,addr:string,bit:string,mode:string){
+    public setFaultInject(machName: string, deviceName: string, addr: string, bit: string, mode: string) {
         const baseRequest = new BaseRequest("SE_set_fault_inject");
         const args: { [key: string]: string } = {};
         args.machName = machName;
@@ -253,7 +269,7 @@ export class RequestFactory {
 
 
 
-    public deleteFaultInject(machName:string,deviceName:string,addr:string,bit:string,mode:string){
+    public deleteFaultInject(machName: string, deviceName: string, addr: string, bit: string, mode: string) {
         const baseRequest = new BaseRequest("SE_delete_fault");
         const args: { [key: string]: string } = {};
         args.machName = machName;
@@ -268,7 +284,7 @@ export class RequestFactory {
     }
 
 
-    
+
 
     public getFaultInjectList() {
         const baseRequest = new BaseRequest("SE_get_fault_inject_list");
@@ -279,11 +295,11 @@ export class RequestFactory {
 
 
 
-    public getDisassembleInfo(cpuName:string,startAddr:string,nums:string){
+    public getDisassembleInfo(cpuName: string, startAddr: string, nums: string) {
         const baseRequest = new BaseRequest("SE_get_disassemble_info");
         const args: { [key: string]: string } = {};
         args.cpuname = cpuName;
-        args.startAddr = "0x"+startAddr
+        args.startAddr = "0x" + startAddr
         args.length = nums
         baseRequest.setArgs(args)
         const request = new JSONRequest()
@@ -295,7 +311,7 @@ export class RequestFactory {
 
 
 
-    public singleStep(cpuName:string){
+    public singleStep(cpuName: string) {
         const baseRequest = new BaseRequest("SE_system_step");
         const args: { [key: string]: string } = {};
         args.cpuname = cpuName;
@@ -306,7 +322,7 @@ export class RequestFactory {
     }
 
 
-    public getcpuRegisterInfo(cpuName:string){
+    public getcpuRegisterInfo(cpuName: string) {
         const baseRequest = new BaseRequest("SE_get_cpu_register_info");
         const args: { [key: string]: string } = {};
         args.cpuname = cpuName;

package/src/SkyEyeClient.ts

@@ -402,7 +402,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
 
 
 
-    public async setGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType, value: string) {
+    public async setGlobalVarValue(cpuName: string, varName: string, bytesNum: number, valueType: GlobalVarType, value: string) {
         try {
             return await this.call(RequestFactory.getInstance().setGlobalVarValue(cpuName, varName, bytesNum, valueType, value))
         } catch (error) {
@@ -415,7 +415,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
         const cpuList = (await this.getCpuList()).getCpuList();
         if (cpuList != null && cpuList.length > 0) {
             try {
-                return await this.call(RequestFactory.getInstance().setGlobalVarValue(cpuList[0].getName(), varName, "4", valueType, value));
+                return await this.call(RequestFactory.getInstance().setGlobalVarValue(cpuList[0].getName(), varName, 8, valueType, value));
             } catch (error) {
                 console.error("Error during setGlobalVarValueDefault:", error);
                 throw error;
@@ -427,14 +427,6 @@ export class SkyEyeClient extends JSONTransmissionClient {
     }
 
 
-    public async getMemoryValue(cpuName: string, baseAddr: string, length: string) {
-        try {
-            return this.getAddressingSpace(cpuName, baseAddr, length);
-        } catch (error) {
-            console.error("Error during getMemoryValue:", error);
-            throw error;
-        }
-    }
 
 
     public async getAddressingSpace(cpuName: string, baseAddr: string, length: string) {
@@ -445,9 +437,14 @@ export class SkyEyeClient extends JSONTransmissionClient {
             throw error;
         }
     }
-
-
-
+    public async getMemoryValue(cpuName: string, baseAddr: string, length: string) {
+        try {
+            return this.getAddressingSpace(cpuName, baseAddr, length);
+        } catch (error) {
+            console.error("Error during getMemoryValue:", error);
+            throw error;
+        }
+    }
     public async getMemoryValueDefault(baseAddr: string, length: string) {
         try {
             return this.getAddressingSpaceDefault(baseAddr, length);
@@ -456,8 +453,6 @@ export class SkyEyeClient extends JSONTransmissionClient {
             throw error;
         }
     }
-
-
     public async getAddressingSpaceDefault(baseAddr: string, length: string) {
         const cpuList = (await this.getCpuList()).getCpuList();
         if (cpuList != null && cpuList.length > 0) {
@@ -473,6 +468,30 @@ export class SkyEyeClient extends JSONTransmissionClient {
         }
     }
 
+    public async setMemoryValue(cpuName: string, baseAddr: string, value: string, length: string) {
+        try {
+            return await this.call(RequestFactory.getInstance().setMemoryValue(cpuName, baseAddr, value, length));
+        } catch (error) {
+            console.error("Error during getAddressingSpaceDefault:", error);
+            throw error;
+        }
+    }
+    public async setMemoryValueDefault(baseAddr: string, value: string, length: string) {
+        const cpuList = (await this.getCpuList()).getCpuList();
+        if (cpuList != null && cpuList.length > 0) {
+            try {
+                return await this.setMemoryValue(cpuList[0].getName(), baseAddr, value, length)
+            } catch (error) {
+                console.error("Error during getAddressingSpaceDefault:", error);
+                throw error;
+            }
+        } else {
+            console.error("无法获取cpu，请确认cpu是否存在:");
+            throw new SkyEyeSDKException("无法获取cpu，请确认cpu是否存在:");
+        }
+    }
+
+
 
     public async getCpuRegisters(cpuName: string) {
         const response = new GetCpuRegisterInfoResponse();

package/test.ts

@@ -215,18 +215,23 @@ async function test() {
     // const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', '50051');
     // await client.initSkyEyeAndRun2(pathSkyEye, fileName, port, skyeyeDir)
 
-    const pathSkyEye = "D:/data/case/workspace_c6713/targets/c6713_fc_1553b";
-    const fileName = "c6713_fc_1553b.skyeye";
-    const skyeyeDir = "D:/install/skyeye/opt/skyeye/bin/skyeye.exe"
+    // const pathSkyEye = "D:/data/case/workspace_c6713/targets/c6713_fc_1553b";
+    // const fileName = "c6713_fc_1553b.skyeye";
+    // const skyeyeDir = "D:/install/skyeye/opt/skyeye/bin/skyeye.exe"
 
 
     const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', '50051');
+
     // const response =await  client.getCurrentRunningState()
     // const response = await client.getMemoryValueDefault("128","4")
-    const response = await client.getGlobalVarValueDefault("number_b","int")
-    console.log("response:", response)
+    const response = await client.getGlobalVarValueDefault("number_a","int")
+    // const response = await client.setGlobalVarValueDefault("number_a", "int", "12")
 
 
+
+    // const response = await client.getMemoryValueDefault("10001", "1")
+    console.log("response:", response)
+
     //启动多个skyeye
     // const count = 5;
     // const map = new Map<number, any>;