skyeye-sdk-js 1.1.1 → 1.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/RequestFactory.d.ts +6 -6
- package/dist/src/RequestFactory.js +5 -5
- package/dist/src/SkyEyeClient.d.ts +16 -16
- package/dist/src/SkyEyeClient.js +14 -3
- package/dist/src/models/FaultInjectItem.d.ts +2 -2
- package/dist/src/models/FaultInjectItemInterface.d.ts +2 -2
- package/dist/src/models/Register.d.ts +4 -4
- package/dist/src/models/RegisterInterface.d.ts +4 -4
- package/dist/test.js +2 -2
- package/package.json +1 -1
- package/src/RequestFactory.ts +11 -13
- package/src/SkyEyeClient.ts +32 -21
- package/src/models/FaultInjectItem.ts +2 -2
- package/src/models/FaultInjectItemInterface.ts +2 -2
- package/src/models/Register.ts +4 -4
- package/src/models/RegisterInterface.ts +4 -4
- package/test.ts +12 -12
|
@@ -10,7 +10,7 @@ export declare class RequestFactory {
|
|
|
10
10
|
stopCommand(): JSONRequest;
|
|
11
11
|
quitCommand(): JSONRequest;
|
|
12
12
|
getCpuList(): JSONRequest;
|
|
13
|
-
getMemoryValue(cpuName: string, baseAddr:
|
|
13
|
+
getMemoryValue(cpuName: string, baseAddr: string, length: string): JSONRequest;
|
|
14
14
|
enableDeviceWork(deviceName: string): JSONRequest;
|
|
15
15
|
disableDeviceWork(deviceName: string): JSONRequest;
|
|
16
16
|
changeDir(path: string): JSONRequest;
|
|
@@ -19,17 +19,17 @@ export declare class RequestFactory {
|
|
|
19
19
|
getCurrentSimulationTime(): JSONRequest;
|
|
20
20
|
getCurrentPC(cpuName: string): JSONRequest;
|
|
21
21
|
getCpuMips(cpuName: string): JSONRequest;
|
|
22
|
-
getGlobalVarValue(cpuName: string, varName: string, bytesNum:
|
|
23
|
-
setGlobalVarValue(cpuName: string, varName: string, bytesNum:
|
|
22
|
+
getGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType): JSONRequest;
|
|
23
|
+
setGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType, value: string): JSONRequest;
|
|
24
24
|
getDeviceList(): JSONRequest;
|
|
25
25
|
getDeviceTree(): JSONRequest;
|
|
26
|
-
setRegisterValue(machName: string, deviceName: string, regName: string, value:
|
|
26
|
+
setRegisterValue(machName: string, deviceName: string, regName: string, value: string): JSONRequest;
|
|
27
27
|
getAllDeviceInfo(): JSONRequest;
|
|
28
|
-
getRamAddrInfo(machName: string, addr:
|
|
28
|
+
getRamAddrInfo(machName: string, addr: string): JSONRequest;
|
|
29
29
|
setFaultInject(machName: string, deviceName: string, addr: string, bit: string, mode: string): JSONRequest;
|
|
30
30
|
deleteFaultInject(machName: string, deviceName: string, addr: string, bit: string, mode: string): JSONRequest;
|
|
31
31
|
getFaultInjectList(): JSONRequest;
|
|
32
|
-
getDisassembleInfo(cpuName: string, startAddr:
|
|
32
|
+
getDisassembleInfo(cpuName: string, startAddr: string, nums: string): JSONRequest;
|
|
33
33
|
singleStep(cpuName: string): JSONRequest;
|
|
34
34
|
getcpuRegisterInfo(cpuName: string): JSONRequest;
|
|
35
35
|
}
|
|
@@ -53,8 +53,8 @@ class RequestFactory {
|
|
|
53
53
|
const baseRequest = new BaseRequest_1.BaseRequest("SE_get_memory_value");
|
|
54
54
|
const args = {};
|
|
55
55
|
args.cpuname = cpuName;
|
|
56
|
-
args.baseaddr = "0x" + baseAddr
|
|
57
|
-
args.length = length
|
|
56
|
+
args.baseaddr = "0x" + baseAddr;
|
|
57
|
+
args.length = length;
|
|
58
58
|
baseRequest.setArgs(args);
|
|
59
59
|
const request = new skyeye_rpc_pb_1.JSONRequest();
|
|
60
60
|
request.setRequest(baseRequest.toJSONString());
|
|
@@ -132,7 +132,7 @@ class RequestFactory {
|
|
|
132
132
|
const args = {};
|
|
133
133
|
args.cpu_name = cpuName;
|
|
134
134
|
args.var_name = varName;
|
|
135
|
-
args.value_bytes_number =
|
|
135
|
+
args.value_bytes_number = bytesNum;
|
|
136
136
|
args.value_type = valueType;
|
|
137
137
|
baseRequest.setArgs(args);
|
|
138
138
|
const request = new skyeye_rpc_pb_1.JSONRequest();
|
|
@@ -186,7 +186,7 @@ class RequestFactory {
|
|
|
186
186
|
const baseRequest = new BaseRequest_1.BaseRequest("SE_get_mem_device_addr_info");
|
|
187
187
|
const args = {};
|
|
188
188
|
args.machName = machName;
|
|
189
|
-
args.addr =
|
|
189
|
+
args.addr = addr;
|
|
190
190
|
baseRequest.setArgs(args);
|
|
191
191
|
const request = new skyeye_rpc_pb_1.JSONRequest();
|
|
192
192
|
request.setRequest(baseRequest.toJSONString());
|
|
@@ -229,7 +229,7 @@ class RequestFactory {
|
|
|
229
229
|
const args = {};
|
|
230
230
|
args.cpuname = cpuName;
|
|
231
231
|
args.startAddr = "0x" + startAddr;
|
|
232
|
-
args.length =
|
|
232
|
+
args.length = nums;
|
|
233
233
|
baseRequest.setArgs(args);
|
|
234
234
|
const request = new skyeye_rpc_pb_1.JSONRequest();
|
|
235
235
|
request.setRequest(baseRequest.toJSONString());
|
|
@@ -39,31 +39,31 @@ export declare class SkyEyeClient extends JSONTransmissionClient {
|
|
|
39
39
|
getCurrentPC(): Promise<any>;
|
|
40
40
|
getCpuMips(cpuName: string): Promise<any>;
|
|
41
41
|
getCurrentCpuMips(): Promise<any>;
|
|
42
|
-
getGlobalVarValue(cpuName: string, varName: string, bytesNum:
|
|
42
|
+
getGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType): Promise<any>;
|
|
43
43
|
getGlobalVarValueDefault(varName: string, valueType: GlobalVarType): Promise<any>;
|
|
44
|
-
setGlobalVarValue(cpuName: string, varName: string, bytesNum:
|
|
44
|
+
setGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType, value: string): Promise<any>;
|
|
45
45
|
setGlobalVarValueDefault(varName: string, valueType: GlobalVarType, value: string): Promise<any>;
|
|
46
|
-
getMemoryValue(cpuName: string, baseAddr:
|
|
47
|
-
getAddressingSpace(cpuName: string, baseAddr:
|
|
48
|
-
getMemoryValueDefault(baseAddr:
|
|
49
|
-
getAddressingSpaceDefault(baseAddr:
|
|
46
|
+
getMemoryValue(cpuName: string, baseAddr: string, length: string): Promise<any>;
|
|
47
|
+
getAddressingSpace(cpuName: string, baseAddr: string, length: string): Promise<any>;
|
|
48
|
+
getMemoryValueDefault(baseAddr: string, length: string): Promise<any>;
|
|
49
|
+
getAddressingSpaceDefault(baseAddr: string, length: string): Promise<any>;
|
|
50
50
|
getCpuRegisters(cpuName: string): Promise<GetCpuRegisterInfoResponse>;
|
|
51
51
|
getCpuRegistersDefault(): Promise<GetCpuRegisterInfoResponse>;
|
|
52
|
-
setCpuRegisterValueDefault(register: Register, value:
|
|
53
|
-
setCpuRegisterValue(boardName: string, cpuName: string, registerName: string, value:
|
|
52
|
+
setCpuRegisterValueDefault(register: Register, value: string): Promise<any>;
|
|
53
|
+
setCpuRegisterValue(boardName: string, cpuName: string, registerName: string, value: string): Promise<any>;
|
|
54
54
|
getDeviceTree(): Promise<GetDeviceTreeResponse>;
|
|
55
55
|
getCurrentRunningState(): Promise<GetRunningStateResponse>;
|
|
56
56
|
getAllDeviceInfo(): Promise<GetAllDeviceInfoResponse>;
|
|
57
|
-
getRamAddrInfo(machName: string, addr:
|
|
58
|
-
setRamFaultInjectDefault(device: Device, addr:
|
|
59
|
-
setRamFaultInject(boardName: string, deviceName: string, addr:
|
|
60
|
-
setRegisterFaultInjectDefault(register: Register, bit:
|
|
61
|
-
setRegisterFaultInject(boardName: string, deviceName: string, addr:
|
|
57
|
+
getRamAddrInfo(machName: string, addr: string): Promise<GetRamAddrInfoResponse>;
|
|
58
|
+
setRamFaultInjectDefault(device: Device, addr: string, bit: string, mode: FaultInjectType): Promise<any>;
|
|
59
|
+
setRamFaultInject(boardName: string, deviceName: string, addr: string, bit: string, mode: FaultInjectType): Promise<any>;
|
|
60
|
+
setRegisterFaultInjectDefault(register: Register, bit: string, mode: FaultInjectType): Promise<any>;
|
|
61
|
+
setRegisterFaultInject(boardName: string, deviceName: string, addr: string, bit: string, mode: FaultInjectType): Promise<any>;
|
|
62
62
|
deleteFaultInjectDefault(faultInjectItem: FaultInjectItem): Promise<any>;
|
|
63
|
-
deleteFaultInject(boardName: string, deviceName: string, addr:
|
|
63
|
+
deleteFaultInject(boardName: string, deviceName: string, addr: string, bit: string, mode: FaultInjectType): Promise<any>;
|
|
64
64
|
getFaultInjectList(): Promise<GetFaultInjectListResponse>;
|
|
65
|
-
getDisassembleInfo(cpuName: string, startAddr:
|
|
66
|
-
getDisassembleInfoDefault(startAddr:
|
|
65
|
+
getDisassembleInfo(cpuName: string, startAddr: string, nums: string): Promise<GetDisassembleInfoResponse>;
|
|
66
|
+
getDisassembleInfoDefault(startAddr: string, nums: string): Promise<GetDisassembleInfoResponse>;
|
|
67
67
|
SingleStep(cpuName: string): Promise<any>;
|
|
68
68
|
SingleStepDefault(): Promise<any>;
|
|
69
69
|
close(): boolean;
|
package/dist/src/SkyEyeClient.js
CHANGED
|
@@ -410,7 +410,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
|
|
|
410
410
|
const cpuList = (yield this.getCpuList()).getCpuList();
|
|
411
411
|
if (cpuList != null && cpuList.length > 0) {
|
|
412
412
|
try {
|
|
413
|
-
return yield this.call(RequestFactory_1.RequestFactory.getInstance().getGlobalVarValue(cpuList[0].getName(), varName, 4, valueType));
|
|
413
|
+
return yield this.call(RequestFactory_1.RequestFactory.getInstance().getGlobalVarValue(cpuList[0].getName(), varName, "4", valueType));
|
|
414
414
|
}
|
|
415
415
|
catch (error) {
|
|
416
416
|
console.error("Error during getGlobalVarValueDefault:", error);
|
|
@@ -439,7 +439,7 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
|
|
|
439
439
|
const cpuList = (yield this.getCpuList()).getCpuList();
|
|
440
440
|
if (cpuList != null && cpuList.length > 0) {
|
|
441
441
|
try {
|
|
442
|
-
return yield this.call(RequestFactory_1.RequestFactory.getInstance().setGlobalVarValue(cpuList[0].getName(), varName, 4, valueType, value));
|
|
442
|
+
return yield this.call(RequestFactory_1.RequestFactory.getInstance().setGlobalVarValue(cpuList[0].getName(), varName, "4", valueType, value));
|
|
443
443
|
}
|
|
444
444
|
catch (error) {
|
|
445
445
|
console.error("Error during setGlobalVarValueDefault:", error);
|
|
@@ -529,7 +529,18 @@ class SkyEyeClient extends skyeye_rpc_grpc_pb_1.JSONTransmissionClient {
|
|
|
529
529
|
if (r1.offset === r2.offset) {
|
|
530
530
|
return 0;
|
|
531
531
|
}
|
|
532
|
-
|
|
532
|
+
let numOffset1 = parseInt(r1.offset);
|
|
533
|
+
let numOffset2 = parseInt(r2.offset);
|
|
534
|
+
let result = 0;
|
|
535
|
+
if (!isNaN(numOffset1) && !isNaN(numOffset2)) {
|
|
536
|
+
result = numOffset1 - numOffset2;
|
|
537
|
+
console.log("Result:", result);
|
|
538
|
+
}
|
|
539
|
+
else {
|
|
540
|
+
console.log("Invalid offset values.");
|
|
541
|
+
}
|
|
542
|
+
return result > 0 ? 1 : -1;
|
|
543
|
+
// return r1.offset! - r2.offset! > 0 ? 1 : -1;
|
|
533
544
|
});
|
|
534
545
|
});
|
|
535
546
|
}
|
|
@@ -12,19 +12,19 @@ export declare class Register implements Node {
|
|
|
12
12
|
/**
|
|
13
13
|
* 寄存器的基地址
|
|
14
14
|
*/
|
|
15
|
-
baseAddr:
|
|
15
|
+
baseAddr: string | null;
|
|
16
16
|
/**
|
|
17
17
|
* 寄存器位数
|
|
18
18
|
*/
|
|
19
|
-
bits:
|
|
19
|
+
bits: string | null;
|
|
20
20
|
/**
|
|
21
21
|
* 寄存器值
|
|
22
22
|
*/
|
|
23
|
-
value:
|
|
23
|
+
value: string | null;
|
|
24
24
|
/**
|
|
25
25
|
* 寄存器偏移值
|
|
26
26
|
*/
|
|
27
|
-
offset:
|
|
27
|
+
offset: string | null;
|
|
28
28
|
/**
|
|
29
29
|
* 寄存器描述
|
|
30
30
|
*/
|
|
@@ -2,9 +2,9 @@ import { Node } from './Node';
|
|
|
2
2
|
export interface RegisterInterface {
|
|
3
3
|
name: string;
|
|
4
4
|
parent: Node | null;
|
|
5
|
-
baseAddr:
|
|
6
|
-
bits:
|
|
7
|
-
value:
|
|
8
|
-
offset:
|
|
5
|
+
baseAddr: string | null;
|
|
6
|
+
bits: string | null;
|
|
7
|
+
value: string | null;
|
|
8
|
+
offset: string | null;
|
|
9
9
|
description: string;
|
|
10
10
|
}
|
package/dist/test.js
CHANGED
|
@@ -14,7 +14,7 @@ const { SkyEyeClient } = require('./src/SkyEyeClient');
|
|
|
14
14
|
function test() {
|
|
15
15
|
return __awaiter(this, void 0, void 0, function* () {
|
|
16
16
|
const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', '50051');
|
|
17
|
-
console.log("Connected to SkyEye server");
|
|
17
|
+
// console.log("Connected to SkyEye server");
|
|
18
18
|
// await client.getDeviceList();
|
|
19
19
|
// await client.getCurrentCpuMips();
|
|
20
20
|
// await client.runCommand();
|
|
@@ -40,7 +40,7 @@ function test() {
|
|
|
40
40
|
// stream.on('end', () => {
|
|
41
41
|
// console.log('Stream ended');
|
|
42
42
|
// });
|
|
43
|
-
// stream.on('error', (error:
|
|
43
|
+
// stream.on('error', (error: Error) => {
|
|
44
44
|
// console.error('Error occurred:', error.message);
|
|
45
45
|
// });
|
|
46
46
|
});
|
package/package.json
CHANGED
package/src/RequestFactory.ts
CHANGED
|
@@ -62,12 +62,12 @@ export class RequestFactory {
|
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
|
|
65
|
-
public getMemoryValue(cpuName: string, baseAddr:
|
|
65
|
+
public getMemoryValue(cpuName: string, baseAddr: string, length: string) {
|
|
66
66
|
const baseRequest = new BaseRequest("SE_get_memory_value");
|
|
67
67
|
const args: { [key: string]: string } = {};
|
|
68
68
|
args.cpuname = cpuName;
|
|
69
|
-
args.baseaddr = "0x" + baseAddr
|
|
70
|
-
args.length = length
|
|
69
|
+
args.baseaddr = "0x" + baseAddr;
|
|
70
|
+
args.length = length;
|
|
71
71
|
baseRequest.setArgs(args)
|
|
72
72
|
const request = new JSONRequest()
|
|
73
73
|
request.setRequest(baseRequest.toJSONString());
|
|
@@ -153,13 +153,13 @@ export class RequestFactory {
|
|
|
153
153
|
return request;
|
|
154
154
|
}
|
|
155
155
|
|
|
156
|
-
public getGlobalVarValue(cpuName: string, varName: string, bytesNum:
|
|
156
|
+
public getGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType) {
|
|
157
157
|
const baseRequest = new BaseRequest("SE_get_global_variable_value");
|
|
158
158
|
const args: { [key: string]: string } = {};
|
|
159
159
|
|
|
160
160
|
args.cpu_name = cpuName;
|
|
161
161
|
args.var_name = varName;
|
|
162
|
-
args.value_bytes_number =
|
|
162
|
+
args.value_bytes_number = bytesNum
|
|
163
163
|
args.value_type = valueType;
|
|
164
164
|
baseRequest.setArgs(args)
|
|
165
165
|
const request = new JSONRequest()
|
|
@@ -168,7 +168,7 @@ export class RequestFactory {
|
|
|
168
168
|
}
|
|
169
169
|
|
|
170
170
|
|
|
171
|
-
public setGlobalVarValue(cpuName: string, varName: string, bytesNum:
|
|
171
|
+
public setGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType, value: string) {
|
|
172
172
|
const baseRequest = new BaseRequest("SE_set_global_variable_value");
|
|
173
173
|
const args: { [key: string]: string } = {};
|
|
174
174
|
args.cpu_name = cpuName;
|
|
@@ -201,7 +201,7 @@ export class RequestFactory {
|
|
|
201
201
|
|
|
202
202
|
|
|
203
203
|
|
|
204
|
-
public setRegisterValue(machName: string, deviceName: string, regName: string, value:
|
|
204
|
+
public setRegisterValue(machName: string, deviceName: string, regName: string, value: string) {
|
|
205
205
|
const baseRequest = new BaseRequest("SE_set_device_register_value");
|
|
206
206
|
const args: { [key: string]: string } = {};
|
|
207
207
|
args.machName = machName;
|
|
@@ -214,8 +214,6 @@ export class RequestFactory {
|
|
|
214
214
|
return request;
|
|
215
215
|
}
|
|
216
216
|
|
|
217
|
-
|
|
218
|
-
|
|
219
217
|
|
|
220
218
|
public getAllDeviceInfo() {
|
|
221
219
|
const baseRequest = new BaseRequest("SE_get_all_fault_inject_device_info");
|
|
@@ -225,11 +223,11 @@ export class RequestFactory {
|
|
|
225
223
|
}
|
|
226
224
|
|
|
227
225
|
|
|
228
|
-
public getRamAddrInfo(machName:string,addr:
|
|
226
|
+
public getRamAddrInfo(machName:string,addr:string){
|
|
229
227
|
const baseRequest = new BaseRequest("SE_get_mem_device_addr_info");
|
|
230
228
|
const args: { [key: string]: string } = {};
|
|
231
229
|
args.machName = machName;
|
|
232
|
-
args.addr =
|
|
230
|
+
args.addr = addr
|
|
233
231
|
baseRequest.setArgs(args)
|
|
234
232
|
const request = new JSONRequest()
|
|
235
233
|
request.setRequest(baseRequest.toJSONString());
|
|
@@ -281,12 +279,12 @@ export class RequestFactory {
|
|
|
281
279
|
|
|
282
280
|
|
|
283
281
|
|
|
284
|
-
public getDisassembleInfo(cpuName:string,startAddr:
|
|
282
|
+
public getDisassembleInfo(cpuName:string,startAddr:string,nums:string){
|
|
285
283
|
const baseRequest = new BaseRequest("SE_get_disassemble_info");
|
|
286
284
|
const args: { [key: string]: string } = {};
|
|
287
285
|
args.cpuname = cpuName;
|
|
288
286
|
args.startAddr = "0x"+startAddr
|
|
289
|
-
args.length =
|
|
287
|
+
args.length = nums
|
|
290
288
|
baseRequest.setArgs(args)
|
|
291
289
|
const request = new JSONRequest()
|
|
292
290
|
request.setRequest(baseRequest.toJSONString());
|
package/src/SkyEyeClient.ts
CHANGED
|
@@ -43,7 +43,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
43
43
|
}
|
|
44
44
|
|
|
45
45
|
|
|
46
|
-
public async RunTestcase(json:string) {
|
|
46
|
+
public async RunTestcase(json: string) {
|
|
47
47
|
try {
|
|
48
48
|
const request = new JSONRequest();
|
|
49
49
|
request.setRequest(json);
|
|
@@ -56,7 +56,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
|
|
59
|
-
public async Monitor(json:string) {
|
|
59
|
+
public async Monitor(json: string) {
|
|
60
60
|
try {
|
|
61
61
|
const request = new JSONRequest();
|
|
62
62
|
request.setRequest(json);
|
|
@@ -350,7 +350,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
350
350
|
}
|
|
351
351
|
|
|
352
352
|
|
|
353
|
-
public async getGlobalVarValue(cpuName: string, varName: string, bytesNum:
|
|
353
|
+
public async getGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType) {
|
|
354
354
|
try {
|
|
355
355
|
return await this.call(RequestFactory.getInstance().getGlobalVarValue(cpuName, varName, bytesNum, valueType))
|
|
356
356
|
} catch (error) {
|
|
@@ -366,7 +366,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
366
366
|
const cpuList = (await this.getCpuList()).getCpuList();
|
|
367
367
|
if (cpuList != null && cpuList.length > 0) {
|
|
368
368
|
try {
|
|
369
|
-
return await this.call(RequestFactory.getInstance().getGlobalVarValue(cpuList[0].getName(), varName, 4, valueType));
|
|
369
|
+
return await this.call(RequestFactory.getInstance().getGlobalVarValue(cpuList[0].getName(), varName, "4", valueType));
|
|
370
370
|
} catch (error) {
|
|
371
371
|
console.error("Error during getGlobalVarValueDefault:", error);
|
|
372
372
|
throw error;
|
|
@@ -381,7 +381,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
381
381
|
|
|
382
382
|
|
|
383
383
|
|
|
384
|
-
public async setGlobalVarValue(cpuName: string, varName: string, bytesNum:
|
|
384
|
+
public async setGlobalVarValue(cpuName: string, varName: string, bytesNum: string, valueType: GlobalVarType, value: string) {
|
|
385
385
|
try {
|
|
386
386
|
return await this.call(RequestFactory.getInstance().setGlobalVarValue(cpuName, varName, bytesNum, valueType, value))
|
|
387
387
|
} catch (error) {
|
|
@@ -394,7 +394,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
394
394
|
const cpuList = (await this.getCpuList()).getCpuList();
|
|
395
395
|
if (cpuList != null && cpuList.length > 0) {
|
|
396
396
|
try {
|
|
397
|
-
return await this.call(RequestFactory.getInstance().setGlobalVarValue(cpuList[0].getName(), varName, 4, valueType, value));
|
|
397
|
+
return await this.call(RequestFactory.getInstance().setGlobalVarValue(cpuList[0].getName(), varName, "4", valueType, value));
|
|
398
398
|
} catch (error) {
|
|
399
399
|
console.error("Error during setGlobalVarValueDefault:", error);
|
|
400
400
|
throw error;
|
|
@@ -406,7 +406,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
406
406
|
}
|
|
407
407
|
|
|
408
408
|
|
|
409
|
-
public async getMemoryValue(cpuName: string, baseAddr:
|
|
409
|
+
public async getMemoryValue(cpuName: string, baseAddr: string, length: string) {
|
|
410
410
|
try {
|
|
411
411
|
return this.getAddressingSpace(cpuName, baseAddr, length);
|
|
412
412
|
} catch (error) {
|
|
@@ -416,7 +416,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
416
416
|
}
|
|
417
417
|
|
|
418
418
|
|
|
419
|
-
public async getAddressingSpace(cpuName: string, baseAddr:
|
|
419
|
+
public async getAddressingSpace(cpuName: string, baseAddr: string, length: string) {
|
|
420
420
|
try {
|
|
421
421
|
return await this.call(RequestFactory.getInstance().getMemoryValue(cpuName, baseAddr, length));
|
|
422
422
|
} catch (error) {
|
|
@@ -427,7 +427,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
427
427
|
|
|
428
428
|
|
|
429
429
|
|
|
430
|
-
public async getMemoryValueDefault(baseAddr:
|
|
430
|
+
public async getMemoryValueDefault(baseAddr: string, length: string) {
|
|
431
431
|
try {
|
|
432
432
|
return this.getAddressingSpaceDefault(baseAddr, length);
|
|
433
433
|
} catch (error) {
|
|
@@ -437,7 +437,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
437
437
|
}
|
|
438
438
|
|
|
439
439
|
|
|
440
|
-
public async getAddressingSpaceDefault(baseAddr:
|
|
440
|
+
public async getAddressingSpaceDefault(baseAddr: string, length: string) {
|
|
441
441
|
const cpuList = (await this.getCpuList()).getCpuList();
|
|
442
442
|
if (cpuList != null && cpuList.length > 0) {
|
|
443
443
|
try {
|
|
@@ -478,7 +478,18 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
478
478
|
if (r1.offset === r2.offset) {
|
|
479
479
|
return 0;
|
|
480
480
|
}
|
|
481
|
-
|
|
481
|
+
|
|
482
|
+
let numOffset1: number = parseInt(r1.offset);
|
|
483
|
+
let numOffset2: number = parseInt(r2.offset);
|
|
484
|
+
let result: number = 0;
|
|
485
|
+
if (!isNaN(numOffset1) && !isNaN(numOffset2)) {
|
|
486
|
+
result = numOffset1 - numOffset2;
|
|
487
|
+
console.log("Result:", result);
|
|
488
|
+
} else {
|
|
489
|
+
console.log("Invalid offset values.");
|
|
490
|
+
}
|
|
491
|
+
return result > 0 ? 1 : -1;
|
|
492
|
+
// return r1.offset! - r2.offset! > 0 ? 1 : -1;
|
|
482
493
|
});
|
|
483
494
|
});
|
|
484
495
|
} else {
|
|
@@ -508,7 +519,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
508
519
|
}
|
|
509
520
|
|
|
510
521
|
|
|
511
|
-
public async setCpuRegisterValueDefault(register: Register, value:
|
|
522
|
+
public async setCpuRegisterValueDefault(register: Register, value: string) {
|
|
512
523
|
try {
|
|
513
524
|
return await this.setCpuRegisterValue(register.getParent().getParent().getName(), register.getParent().getName(), register.getName(), value);
|
|
514
525
|
} catch (error) {
|
|
@@ -518,7 +529,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
518
529
|
}
|
|
519
530
|
|
|
520
531
|
|
|
521
|
-
public async setCpuRegisterValue(boardName: string, cpuName: string, registerName: string, value:
|
|
532
|
+
public async setCpuRegisterValue(boardName: string, cpuName: string, registerName: string, value: string) {
|
|
522
533
|
const deviceTree = await this.getDeviceTree();
|
|
523
534
|
if (!deviceTree.boardMap.has(boardName)) {
|
|
524
535
|
throw new SkyEyeSDKException("未能找到该板卡");
|
|
@@ -612,7 +623,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
612
623
|
}
|
|
613
624
|
|
|
614
625
|
|
|
615
|
-
public async getRamAddrInfo(machName: string, addr:
|
|
626
|
+
public async getRamAddrInfo(machName: string, addr: string) {
|
|
616
627
|
const response = new GetRamAddrInfoResponse();
|
|
617
628
|
try {
|
|
618
629
|
const call = await this.call(RequestFactory.getInstance().getRamAddrInfo(machName, addr))
|
|
@@ -631,7 +642,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
631
642
|
}
|
|
632
643
|
|
|
633
644
|
|
|
634
|
-
public async setRamFaultInjectDefault(device: Device, addr:
|
|
645
|
+
public async setRamFaultInjectDefault(device: Device, addr: string, bit: string, mode: FaultInjectType) {
|
|
635
646
|
try {
|
|
636
647
|
return await this.setRamFaultInject(device.getParent().getName(), device.getName(), addr, bit, mode);
|
|
637
648
|
} catch (error) {
|
|
@@ -641,7 +652,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
641
652
|
|
|
642
653
|
|
|
643
654
|
|
|
644
|
-
public async setRamFaultInject(boardName: string, deviceName: string, addr:
|
|
655
|
+
public async setRamFaultInject(boardName: string, deviceName: string, addr: string, bit: string, mode: FaultInjectType) {
|
|
645
656
|
try {
|
|
646
657
|
return await this.call(RequestFactory.getInstance().setFaultInject(boardName, deviceName, String(addr), String(bit), mode))
|
|
647
658
|
} catch (error) {
|
|
@@ -651,7 +662,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
651
662
|
|
|
652
663
|
|
|
653
664
|
|
|
654
|
-
public async setRegisterFaultInjectDefault(register: Register, bit:
|
|
665
|
+
public async setRegisterFaultInjectDefault(register: Register, bit: string, mode: FaultInjectType) {
|
|
655
666
|
try {
|
|
656
667
|
return await this.setRegisterFaultInject(register.getParent().getParent().getName(), register.getParent().getName(), register.baseAddr, bit, mode)
|
|
657
668
|
} catch (error) {
|
|
@@ -660,7 +671,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
660
671
|
}
|
|
661
672
|
|
|
662
673
|
|
|
663
|
-
public async setRegisterFaultInject(boardName: string, deviceName: string, addr:
|
|
674
|
+
public async setRegisterFaultInject(boardName: string, deviceName: string, addr: string, bit: string, mode: FaultInjectType) {
|
|
664
675
|
try {
|
|
665
676
|
return await this.call(RequestFactory.getInstance().setFaultInject(boardName, deviceName, "0x" + String(addr), String(bit), mode))
|
|
666
677
|
} catch (error) {
|
|
@@ -680,7 +691,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
680
691
|
}
|
|
681
692
|
|
|
682
693
|
|
|
683
|
-
public async deleteFaultInject(boardName: string, deviceName: string, addr:
|
|
694
|
+
public async deleteFaultInject(boardName: string, deviceName: string, addr: string, bit: string, mode: FaultInjectType) {
|
|
684
695
|
try {
|
|
685
696
|
return await this.call(RequestFactory.getInstance().deleteFaultInject(boardName, deviceName, "0x" + String(addr), String(bit), mode))
|
|
686
697
|
} catch (error) {
|
|
@@ -726,7 +737,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
726
737
|
}
|
|
727
738
|
|
|
728
739
|
|
|
729
|
-
public async getDisassembleInfo(cpuName: string, startAddr:
|
|
740
|
+
public async getDisassembleInfo(cpuName: string, startAddr: string, nums: string) {
|
|
730
741
|
const response = new GetDisassembleInfoResponse();
|
|
731
742
|
try {
|
|
732
743
|
const call = await this.call(RequestFactory.getInstance().getDisassembleInfo(cpuName, startAddr, nums))
|
|
@@ -751,7 +762,7 @@ export class SkyEyeClient extends JSONTransmissionClient {
|
|
|
751
762
|
}
|
|
752
763
|
|
|
753
764
|
|
|
754
|
-
public async getDisassembleInfoDefault(startAddr:
|
|
765
|
+
public async getDisassembleInfoDefault(startAddr: string, nums: string) {
|
|
755
766
|
const cpuList = (await this.getCpuList()).getCpuList;
|
|
756
767
|
if (cpuList != null && cpuList.length > 0) {
|
|
757
768
|
return this.getDisassembleInfo(cpuList[0].name, startAddr, nums);
|
package/src/models/Register.ts
CHANGED
|
@@ -15,22 +15,22 @@ export class Register implements Node {
|
|
|
15
15
|
/**
|
|
16
16
|
* 寄存器的基地址
|
|
17
17
|
*/
|
|
18
|
-
public baseAddr:
|
|
18
|
+
public baseAddr: string | null;
|
|
19
19
|
|
|
20
20
|
/**
|
|
21
21
|
* 寄存器位数
|
|
22
22
|
*/
|
|
23
|
-
public bits:
|
|
23
|
+
public bits: string | null;
|
|
24
24
|
|
|
25
25
|
/**
|
|
26
26
|
* 寄存器值
|
|
27
27
|
*/
|
|
28
|
-
public value:
|
|
28
|
+
public value: string | null;
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
31
|
* 寄存器偏移值
|
|
32
32
|
*/
|
|
33
|
-
public offset:
|
|
33
|
+
public offset: string | null;
|
|
34
34
|
|
|
35
35
|
/**
|
|
36
36
|
* 寄存器描述
|
|
@@ -6,9 +6,9 @@ import { DeviceInterface } from './DeviceInterface';
|
|
|
6
6
|
export interface RegisterInterface{
|
|
7
7
|
name: string,
|
|
8
8
|
parent: Node | null,
|
|
9
|
-
baseAddr:
|
|
10
|
-
bits:
|
|
11
|
-
value:
|
|
12
|
-
offset:
|
|
9
|
+
baseAddr: string | null,
|
|
10
|
+
bits: string | null,
|
|
11
|
+
value: string | null,
|
|
12
|
+
offset: string | null,
|
|
13
13
|
description: string
|
|
14
14
|
}
|
package/test.ts
CHANGED
|
@@ -7,7 +7,7 @@ const { SkyEyeClient } = require('./src/SkyEyeClient')
|
|
|
7
7
|
|
|
8
8
|
async function test() {
|
|
9
9
|
const client = SkyEyeClientFactory.instance.createClient('127.0.0.1', '50051');
|
|
10
|
-
console.log("Connected to SkyEye server");
|
|
10
|
+
// console.log("Connected to SkyEye server");
|
|
11
11
|
// await client.getDeviceList();
|
|
12
12
|
// await client.getCurrentCpuMips();
|
|
13
13
|
// await client.runCommand();
|
|
@@ -32,16 +32,16 @@ async function test() {
|
|
|
32
32
|
|
|
33
33
|
// GrpcUtil.initAndRunExample();
|
|
34
34
|
|
|
35
|
-
const bean:string = '{"id":"33d209da-2459-4e49-97c3-5b1509bc638c","steps":[{"condition":{"type":10,"value":"123"},"send":{"target":{"type":2,"addr":"1222"},"data":"0101011101"}},{"condition":{"type":0,"value":"0xff"},"send":{"target":{"type":2,"addr":"1222"},"data":"0101011101"}}],"expects":[{"condition":{"type":0,"value":"0xff"},"send":{"target":{"type":3,"addr":"2221"}}}]}';
|
|
36
|
-
const stream = await client.RunTestcase(bean);
|
|
37
|
-
stream.on('data', (response: JSONResponse) => {
|
|
38
|
-
|
|
39
|
-
});
|
|
40
|
-
stream.on('end', () => {
|
|
41
|
-
|
|
42
|
-
});
|
|
43
|
-
stream.on('error', (error: Error) => {
|
|
44
|
-
|
|
45
|
-
});
|
|
35
|
+
// const bean:string = '{"id":"33d209da-2459-4e49-97c3-5b1509bc638c","steps":[{"condition":{"type":10,"value":"123"},"send":{"target":{"type":2,"addr":"1222"},"data":"0101011101"}},{"condition":{"type":0,"value":"0xff"},"send":{"target":{"type":2,"addr":"1222"},"data":"0101011101"}}],"expects":[{"condition":{"type":0,"value":"0xff"},"send":{"target":{"type":3,"addr":"2221"}}}]}';
|
|
36
|
+
// const stream = await client.RunTestcase(bean);
|
|
37
|
+
// stream.on('data', (response: JSONResponse) => {
|
|
38
|
+
// console.log('Received response:', response.toObject());
|
|
39
|
+
// });
|
|
40
|
+
// stream.on('end', () => {
|
|
41
|
+
// console.log('Stream ended');
|
|
42
|
+
// });
|
|
43
|
+
// stream.on('error', (error: Error) => {
|
|
44
|
+
// console.error('Error occurred:', error.message);
|
|
45
|
+
// });
|
|
46
46
|
}
|
|
47
47
|
test();
|