Skip to content

Commit f3b2578

Browse files
RunDevelopmentRunDevelopment
authoredOct 5, 2021
PureBasic: Fixed token order inside asm token (#3123)
·
v1.30.0v1.26.0
1 parent 314d699 commit f3b2578

File tree

3 files changed

+380
-5
lines changed

3 files changed

+380
-5
lines changed
 

‎components/prism-purebasic.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ Prism.languages.insertBefore('purebasic', 'keyword', {
3939
lookbehind: true,
4040
alias: 'fasm-label'
4141
},
42+
'keyword': [
43+
/\b(?:extern|global)\b[^;\r\n]*/i,
44+
/\b(?:CPU|DEFAULT|FLOAT)\b.*/
45+
],
4246
'function': {
4347
pattern: /^([\t ]*!\s*)[\da-z]+(?=\s|$)/im,
4448
lookbehind: true
@@ -53,10 +57,6 @@ Prism.languages.insertBefore('purebasic', 'keyword', {
5357
lookbehind: true,
5458
alias: 'fasm-label'
5559
},
56-
'keyword': [
57-
/\b(?:extern|global)\b[^;\r\n]*/i,
58-
/\b(?:CPU|DEFAULT|FLOAT)\b.*/
59-
],
6060
'register': /\b(?:st\d|[xyz]mm\d\d?|[cdt]r\d|r\d\d?[bwd]?|[er]?[abcd]x|[abcd][hl]|[er]?(?:bp|di|si|sp)|[cdefgs]s|mm\d+)\b/i,
6161
'number': /(?:\b|-|(?=\$))(?:0[hx](?:[\da-f]*\.)?[\da-f]+(?:p[+-]?\d+)?|\d[\da-f]+[hx]|\$\d[\da-f]*|0[oq][0-7]+|[0-7]+[oq]|0[by][01]+|[01]+[by]|0[dt]\d+|(?:\d+(?:\.\d+)?|\.\d+)(?:\.?e[+-]?\d+)?[dt]?)\b/i,
6262
'operator': /[\[\]*+\-/%<>=&|$!,.:]/

‎components/prism-purebasic.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/languages/purebasic/asm_feature.test

+375
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,375 @@
1+
Procedure.i XorTwoBlocks2(*buffer1, *buffer2, length)
2+
; move all the required data to source reg, destination reg and counter reg
3+
!mov esi, [p.p_buffer1] ; read 32-bit integer from p.p_buffer1 and move to esi
4+
!mov edi, [p.p_buffer2] ; read 32-bit integer from p.p_buffer2 and move to edi
5+
!mov ecx, [p.v_length] ; read 32-bit integer from p.v_length and move to ecx
6+
7+
!@@: ; anonymous label, can be reached by @b (back) or @f (forward)
8+
!mov al, byte [edi + ecx - 1] ; read byte from destination
9+
!xor byte [esi + ecx - 1], al ; xor source with destination (i.e. xor bytes from both blocks)
10+
!dec ecx ; decrease counter
11+
!jne @b ; jumb back to first anonymous label behind
12+
ProcedureReturn 0
13+
EndProcedure
14+
15+
!jne label1
16+
!jmp @b
17+
!EXTERN printf
18+
!DEFAULT rel
19+
20+
; source: http://www.jose.it-berater.org/smfforum/index.php?topic=5091.0
21+
Procedure PopCount64(x.q)
22+
!mov rax, [p.v_x]
23+
!mov rdx, rax
24+
!shr rdx, 1
25+
!and rdx, [popcount64_v55]
26+
!sub rax, rdx
27+
;x = (x & $3333333333333333) + ((x >> 2) & $3333333333333333)
28+
!mov rdx, rax ;x
29+
!and rax, [popcount64_v33]
30+
!shr rdx, 2
31+
!and rdx, [popcount64_v33]
32+
!add rax, rdx
33+
;x = (x + (x >> 4)) & $0f0f0f0f0f0f0f0f0f0f
34+
!mov rdx, rax
35+
!shr rdx, 4
36+
!add rax, rdx
37+
!and rax, [popcount64_v0f]
38+
;x * $0101010101010101 >> 56
39+
!imul rax, [popcount64_v01]
40+
!shr rax, 56
41+
ProcedureReturn
42+
!popcount64_v01: dq 0x0101010101010101
43+
!popcount64_v0f: dq 0x0f0f0f0f0f0f0f0f
44+
!popcount64_v33: dq 0x3333333333333333
45+
!popcount64_v55: dq 0x5555555555555555
46+
EndProcedure
47+
48+
----------------------------------------------------
49+
50+
[
51+
["keyword", "Procedure"],
52+
["punctuation", "."],
53+
"i ",
54+
["function", "XorTwoBlocks2"],
55+
["punctuation", "("],
56+
["operator", "*buffer1"],
57+
["punctuation", ","],
58+
["operator", "*buffer2"],
59+
["punctuation", ","],
60+
" length",
61+
["punctuation", ")"],
62+
63+
["comment", "; move all the required data to source reg, destination reg and counter reg"],
64+
65+
["asm", [
66+
["operator", "!"],
67+
["function", "mov"],
68+
["register", "esi"],
69+
["operator", ","],
70+
["operator", "["],
71+
"p",
72+
["operator", "."],
73+
"p_buffer1",
74+
["operator", "]"]
75+
]],
76+
["comment", "; read 32-bit integer from p.p_buffer1 and move to esi"],
77+
78+
["asm", [
79+
["operator", "!"],
80+
["function", "mov"],
81+
["register", "edi"],
82+
["operator", ","],
83+
["operator", "["],
84+
"p",
85+
["operator", "."],
86+
"p_buffer2",
87+
["operator", "]"]
88+
]],
89+
["comment", "; read 32-bit integer from p.p_buffer2 and move to edi"],
90+
91+
["asm", [
92+
["operator", "!"],
93+
["function", "mov"],
94+
["register", "ecx"],
95+
["operator", ","],
96+
["operator", "["],
97+
"p",
98+
["operator", "."],
99+
"v_length",
100+
["operator", "]"]
101+
]],
102+
["comment", "; read 32-bit integer from p.v_length and move to ecx"],
103+
104+
["asm", [
105+
["operator", "!"],
106+
["label", "@@"],
107+
["operator", ":"]
108+
]],
109+
["comment", "; anonymous label, can be reached by @b (back) or @f (forward)"],
110+
111+
["asm", [
112+
["operator", "!"],
113+
["function", "mov"],
114+
["register", "al"],
115+
["operator", ","],
116+
" byte ",
117+
["operator", "["],
118+
["register", "edi"],
119+
["operator", "+"],
120+
["register", "ecx"],
121+
["operator", "-"],
122+
["number", "1"],
123+
["operator", "]"]
124+
]],
125+
["comment", "; read byte from destination"],
126+
127+
["asm", [
128+
["operator", "!"],
129+
["function", "xor"],
130+
" byte ",
131+
["operator", "["],
132+
["register", "esi"],
133+
["operator", "+"],
134+
["register", "ecx"],
135+
["operator", "-"],
136+
["number", "1"],
137+
["operator", "]"],
138+
["operator", ","],
139+
["register", "al"]
140+
]],
141+
["comment", "; xor source with destination (i.e. xor bytes from both blocks)"],
142+
143+
["asm", [
144+
["operator", "!"],
145+
["function", "dec"],
146+
["register", "ecx"]
147+
]],
148+
["comment", "; decrease counter"],
149+
150+
["asm", [
151+
["operator", "!"],
152+
["function", "jne"],
153+
["label-reference-anonymous", "@b"]
154+
]],
155+
["comment", "; jumb back to first anonymous label behind"],
156+
157+
["keyword", "ProcedureReturn"],
158+
["number", "0"],
159+
160+
["keyword", "EndProcedure"],
161+
162+
["asm", [
163+
["operator", "!"],
164+
["function", "jne"],
165+
["label-reference-addressed", "label1"]
166+
]],
167+
["asm", [
168+
["operator", "!"],
169+
["function", "jmp"],
170+
["label-reference-anonymous", "@b"]
171+
]],
172+
["asm", [
173+
["operator", "!"],
174+
["keyword", "EXTERN printf"]
175+
]],
176+
["asm", [
177+
["operator", "!"],
178+
["keyword", "DEFAULT rel"]
179+
]],
180+
181+
["comment", "; source: http://www.jose.it-berater.org/smfforum/index.php?topic=5091.0"],
182+
183+
["keyword", "Procedure"],
184+
["function", "PopCount64"],
185+
["punctuation", "("],
186+
"x",
187+
["punctuation", "."],
188+
"q",
189+
["punctuation", ")"],
190+
191+
["asm", [
192+
["operator", "!"],
193+
["function", "mov"],
194+
["register", "rax"],
195+
["operator", ","],
196+
["operator", "["],
197+
"p",
198+
["operator", "."],
199+
"v_x",
200+
["operator", "]"]
201+
]],
202+
203+
["asm", [
204+
["operator", "!"],
205+
["function", "mov"],
206+
["register", "rdx"],
207+
["operator", ","],
208+
["register", "rax"]
209+
]],
210+
211+
["asm", [
212+
["operator", "!"],
213+
["function", "shr"],
214+
["register", "rdx"],
215+
["operator", ","],
216+
["number", "1"]
217+
]],
218+
219+
["asm", [
220+
["operator", "!"],
221+
["function", "and"],
222+
["register", "rdx"],
223+
["operator", ","],
224+
["operator", "["],
225+
"popcount64_v55",
226+
["operator", "]"]
227+
]],
228+
229+
["asm", [
230+
["operator", "!"],
231+
["function", "sub"],
232+
["register", "rax"],
233+
["operator", ","],
234+
["register", "rdx"]
235+
]],
236+
237+
["comment", ";x = (x & $3333333333333333) + ((x >> 2) & $3333333333333333)"],
238+
239+
["asm", [
240+
["operator", "!"],
241+
["function", "mov"],
242+
["register", "rdx"],
243+
["operator", ","],
244+
["register", "rax"]
245+
]],
246+
["comment", ";x"],
247+
248+
["asm", [
249+
["operator", "!"],
250+
["function", "and"],
251+
["register", "rax"],
252+
["operator", ","],
253+
["operator", "["],
254+
"popcount64_v33",
255+
["operator", "]"]
256+
]],
257+
258+
["asm", [
259+
["operator", "!"],
260+
["function", "shr"],
261+
["register", "rdx"],
262+
["operator", ","],
263+
["number", "2"]
264+
]],
265+
266+
["asm", [
267+
["operator", "!"],
268+
["function", "and"],
269+
["register", "rdx"],
270+
["operator", ","],
271+
["operator", "["],
272+
"popcount64_v33",
273+
["operator", "]"]
274+
]],
275+
276+
["asm", [
277+
["operator", "!"],
278+
["function", "add"],
279+
["register", "rax"],
280+
["operator", ","],
281+
["register", "rdx"]
282+
]],
283+
284+
["comment", ";x = (x + (x >> 4)) & $0f0f0f0f0f0f0f0f0f0f"],
285+
286+
["asm", [
287+
["operator", "!"],
288+
["function", "mov"],
289+
["register", "rdx"],
290+
["operator", ","],
291+
["register", "rax"]
292+
]],
293+
294+
["asm", [
295+
["operator", "!"],
296+
["function", "shr"],
297+
["register", "rdx"],
298+
["operator", ","],
299+
["number", "4"]
300+
]],
301+
302+
["asm", [
303+
["operator", "!"],
304+
["function", "add"],
305+
["register", "rax"],
306+
["operator", ","],
307+
["register", "rdx"]
308+
]],
309+
310+
["asm", [
311+
["operator", "!"],
312+
["function", "and"],
313+
["register", "rax"],
314+
["operator", ","],
315+
["operator", "["],
316+
"popcount64_v0f",
317+
["operator", "]"]
318+
]],
319+
320+
["comment", ";x * $0101010101010101 >> 56"],
321+
322+
["asm", [
323+
["operator", "!"],
324+
["function", "imul"],
325+
["register", "rax"],
326+
["operator", ","],
327+
["operator", "["],
328+
"popcount64_v01",
329+
["operator", "]"]
330+
]],
331+
332+
["asm", [
333+
["operator", "!"],
334+
["function", "shr"],
335+
["register", "rax"],
336+
["operator", ","],
337+
["number", "56"]
338+
]],
339+
340+
["keyword", "ProcedureReturn"],
341+
342+
["asm", [
343+
["operator", "!"],
344+
["label", "popcount64_v01"],
345+
["operator", ":"],
346+
["function-inline", "dq"],
347+
["number", "0x0101010101010101"]
348+
]],
349+
350+
["asm", [
351+
["operator", "!"],
352+
["label", "popcount64_v0f"],
353+
["operator", ":"],
354+
["function-inline", "dq"],
355+
["number", "0x0f0f0f0f0f0f0f0f"]
356+
]],
357+
358+
["asm", [
359+
["operator", "!"],
360+
["label", "popcount64_v33"],
361+
["operator", ":"],
362+
["function-inline", "dq"],
363+
["number", "0x3333333333333333"]
364+
]],
365+
366+
["asm", [
367+
["operator", "!"],
368+
["label", "popcount64_v55"],
369+
["operator", ":"],
370+
["function-inline", "dq"],
371+
["number", "0x5555555555555555"]
372+
]],
373+
374+
["keyword", "EndProcedure"]
375+
]

0 commit comments

Comments
 (0)
Please sign in to comment.