Skip to content

Commit 78bb21a

Browse files
committed
Updated the jlink library versions.
1 parent bc7a85e commit 78bb21a

File tree

3 files changed

+63
-10
lines changed

3 files changed

+63
-10
lines changed

darm/100.patch

+55-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
--- ./armv7.c 2019-02-23 17:05:38.335168428 -0800
2-
+++ ./armv7.c 2019-02-23 17:09:50.852077479 -0800
1+
--- ./armv7.c 2016-04-07 05:58:04.000000000 -0700
2+
+++ ./armv7.c 2021-08-14 09:57:38.209445391 -0700
33
@@ -126,6 +126,7 @@
44
return 0;
55
}
@@ -8,8 +8,24 @@
88
// otherwise, if the 21th bit is not set, it's either the PLD or the
99
// PLI instruction
1010
// we fall-through here, as 0b011 also handles the PLD and PLI
11-
--- ./thumb.c 2019-02-23 17:06:23.877179514 -0800
12-
+++ ./thumb.c 2019-02-23 17:11:13.181426400 -0800
11+
@@ -731,6 +732,7 @@
12+
}
13+
return 0;
14+
}
15+
+ /* fall through */
16+
17+
case T_ARM_SM:
18+
switch ((uint32_t) d->instr) {
19+
@@ -806,6 +808,7 @@
20+
// SMUL overlaps with SMC, so we define SMUL in SMC..
21+
break;
22+
}
23+
+ /* fall through */
24+
25+
case T_ARM_PAS:
26+
// we have a lookup table with size 64, for all parallel signed and
27+
--- ./thumb.c 2016-04-07 05:58:04.000000000 -0700
28+
+++ ./thumb.c 2021-08-14 09:59:21.004459242 -0700
1329
@@ -137,6 +137,7 @@
1430

1531
case I_ORR: case I_BIC:
@@ -18,11 +34,45 @@
1834
// fall-through as the mvn handler is almost the same, except
1935
// for parsing Rn
2036

21-
@@ -183,6 +184,7 @@
37+
@@ -150,6 +151,7 @@
38+
d->Rn = (w >> 3) & b111;
39+
return 0;
40+
}
41+
+ /* fall through */
42+
43+
case T_THUMB_BRANCH_REG:
44+
d->instr = (w >> 7) & 1 ? I_BLX : I_BX;
45+
@@ -183,6 +185,7 @@
2246
d->Rn = PC;
2347
d->U = B_SET;
2448
d->imm <<= 2;
2549
+ /* fall through */
2650
// fall-through as adr also has to set Rd
2751

2852
case I_MOV:
53+
@@ -193,6 +196,7 @@
54+
d->Rn = (w >> 8) & b111;
55+
return 0;
56+
}
57+
+ /* fall through */
58+
59+
case T_THUMB_EXTEND:
60+
d->instr = type_extend_instr_lookup[(w >> 6) & b11];
61+
--- ./thumb2-decoder.c 2021-08-14 10:00:40.991755591 -0700
62+
+++ ./thumb2-decoder.c 2021-08-14 10:01:33.939316062 -0700
63+
@@ -1203,6 +1203,7 @@
64+
case 3:
65+
return I_QDSUB;
66+
}
67+
+ /* fall through */
68+
69+
case 1:
70+
d->instr_type = T_THUMB2_RD_RM_REG;
71+
@@ -1222,6 +1223,7 @@
72+
case 3:
73+
return I_REVSH;
74+
}
75+
+ /* fall through */
76+
77+
case 2:
78+
if(op2 == 0) {

jlink.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ def get_jlink_dll():
103103
if sys.platform == 'win32':
104104
jlink, backend_info = locate_library('jlinkarm.dll', search_path)
105105
elif sys.platform.startswith('linux'):
106-
jlink, backend_info = locate_library('libjlinkarm.so.6', search_path, ctypes.cdll)
106+
jlink, backend_info = locate_library('libjlinkarm.so.7', search_path, ctypes.cdll)
107107
elif sys.platform == 'darwin':
108-
jlink, backend_info = locate_library('libjlinkarm.so.6.dylib', search_path, ctypes.cdll)
108+
jlink, backend_info = locate_library('libjlinkarm.so.7.dylib', search_path, ctypes.cdll)
109109
return jlink, backend_info
110110

111111
# ----------------------------------------------------------------------------

lib64/README.md

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
If you have a 64 bit OS the 64 bit JLINK libraries should be placed in this directory.
22

3-
That is:
3+
E.g.
44

55
libjlinkarm.so
6-
libjlinkarm.so.6
7-
libjlinkarm.so.6.46.8
6+
libjlinkarm.so.7
7+
libjlinkarm.so.7.52.2
8+
9+
These files can be obtained from the J-Link Software and Documentation pack.
10+
https://www.segger.com/downloads/jlink/

0 commit comments

Comments
 (0)