Skip to content

Commit 16da703

Browse files
HenryHRichHenryHRich
committed
Merge branch 'master' of jsoftware.com:jsource
second stab at fixing crash: remove mf()
2 parents 08c8e1c + 55bd0b1 commit 16da703

21 files changed

Lines changed: 89 additions & 95 deletions

‎.github/workflows/emuavx.yml‎

Lines changed: 33 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
# linux no pyxes -------------------------------------------------------
1818
jelinuxpyx0:
1919
name: JE (Linux no pyxes)
20-
if: ${{ false }}
20+
# if: ${{ false }}
2121
runs-on: ubuntu-22.04
2222
steps:
2323
- name: Checkout Git repository
@@ -43,20 +43,20 @@ jobs:
4343
USE_EMU_AVX: 1
4444
_DEBUG: 3
4545
run: |
46-
script/buildga.sh linux || exit 1
46+
script/buildga.sh linux x86_64 || exit 1
4747
4848
- name: Test JE (Linux no pyxes)
4949
env:
5050
USE_PYXES: 0
5151
USE_EMU_AVX: 1
5252
_DEBUG: 3
5353
run: |
54-
script/testga.sh linux || exit 1
54+
script/testga.sh linux x86_64 || exit 1
5555
5656
# linux no emu ---------------------------------------------------------
5757
jelinuxemu0:
5858
name: JE (Linux no emu)
59-
if: ${{ false }}
59+
# if: ${{ false }}
6060
runs-on: ubuntu-22.04
6161
steps:
6262
- name: Checkout Git repository
@@ -82,20 +82,20 @@ jobs:
8282
USE_EMU_AVX: 0
8383
_DEBUG: 3
8484
run: |
85-
script/buildga.sh linux || exit 1
85+
script/buildga.sh linux x86_64 || exit 1
8686
8787
- name: Test JE (Linux no emu)
8888
env:
8989
USE_PYXES: 1
9090
USE_EMU_AVX: 0
9191
_DEBUG: 3
9292
run: |
93-
script/testga.sh linux || exit 1
93+
script/testga.sh linux x86_64 || exit 1
9494
9595
# linux no pyxes/emu ---------------------------------------------------
9696
jelinuxpyxemu0:
9797
name: JE (Linux no pyxes/emu)
98-
if: ${{ false }}
98+
# if: ${{ false }}
9999
runs-on: ubuntu-22.04
100100
steps:
101101
- name: Checkout Git repository
@@ -121,20 +121,20 @@ jobs:
121121
USE_EMU_AVX: 0
122122
_DEBUG: 3
123123
run: |
124-
script/buildga.sh linux || exit 1
124+
script/buildga.sh linux x86_64 || exit 1
125125
126126
- name: Test JE (Linux no pyxes/emu)
127127
env:
128128
USE_PYXES: 0
129129
USE_EMU_AVX: 0
130130
_DEBUG: 3
131131
run: |
132-
script/testga.sh linux || exit 1
132+
script/testga.sh linux x86_64 || exit 1
133133
134134
# macOS arm64 no pyxes -------------------------------------------------
135135
jemacosarmpyx0:
136136
name: JE (macOS arm64 no pyxes)
137-
if: ${{ false }}
137+
# if: ${{ false }}
138138
runs-on: macos-15
139139
steps:
140140
- name: Checkout Git repository
@@ -152,19 +152,19 @@ jobs:
152152
USE_PYXES: 0
153153
USE_EMU_AVX: 1
154154
run: |
155-
script/buildga.sh darwin || exit 1
155+
script/buildga.sh darwin arm64 || exit 1
156156
157157
- name: Test JE (macOS arm64 no pyxes)
158158
env:
159159
USE_PYXES: 0
160160
USE_EMU_AVX: 1
161161
run: |
162-
script/testga.sh darwin || exit 1
162+
script/testga.sh darwin arm64 || exit 1
163163
164164
# macOS arm64 no emu ---------------------------------------------------
165165
jemacosarmemu0:
166166
name: JE (macOS arm64 no emu)
167-
if: ${{ false }}
167+
# if: ${{ false }}
168168
runs-on: macos-15
169169
steps:
170170
- name: Checkout Git repository
@@ -182,19 +182,19 @@ jobs:
182182
USE_PYXES: 1
183183
USE_EMU_AVX: 0
184184
run: |
185-
script/buildga.sh darwin || exit 1
185+
script/buildga.sh darwin arm64 || exit 1
186186
187187
- name: Test JE (macOS arm64 no emu)
188188
env:
189189
USE_PYXES: 1
190190
USE_EMU_AVX: 0
191191
run: |
192-
script/testga.sh darwin || exit 1
192+
script/testga.sh darwin arm64 || exit 1
193193
194194
# macOS arm64 no pyxes/emu ---------------------------------------------
195195
jemacosarmpyxemu0:
196196
name: JE (macOS arm64 no pyxes/emu)
197-
if: ${{ false }}
197+
# if: ${{ false }}
198198
runs-on: macos-15
199199
steps:
200200
- name: Checkout Git repository
@@ -212,19 +212,19 @@ jobs:
212212
USE_PYXES: 0
213213
USE_EMU_AVX: 0
214214
run: |
215-
script/buildga.sh darwin || exit 1
215+
script/buildga.sh darwin arm64 || exit 1
216216
217217
- name: Test JE (macOS arm64 no pyxes/emu)
218218
env:
219219
USE_PYXES: 0
220220
USE_EMU_AVX: 0
221221
run: |
222-
script/testga.sh darwin || exit 1
222+
script/testga.sh darwin arm64 || exit 1
223223
224224
# rpi64arm no pyxes ----------------------------------------------------
225225
jerpi64armpyx0:
226226
name: JE (Linux arm64 no pyxes)
227-
if: ${{ false }}
227+
# if: ${{ false }}
228228
runs-on: ubuntu-24.04-arm
229229
steps:
230230
- name: Checkout Git repository
@@ -256,7 +256,7 @@ jobs:
256256
# rpi64arm no emu ------------------------------------------------------
257257
jerpi64armemu0:
258258
name: JE (Linux arm64 no emu)
259-
if: ${{ false }}
259+
# if: ${{ false }}
260260
runs-on: ubuntu-24.04-arm
261261
steps:
262262
- name: Checkout Git repository
@@ -288,7 +288,7 @@ jobs:
288288
# rpi64arm no pyxes/emu ------------------------------------------------
289289
jerpi64armpyxemu0:
290290
name: JE (Linux arm64 no pyxes/emu)
291-
if: ${{ false }}
291+
# if: ${{ false }}
292292
runs-on: ubuntu-24.04-arm
293293
steps:
294294
- name: Checkout Git repository
@@ -320,7 +320,7 @@ jobs:
320320
# windows no pyxes -----------------------------------------------------
321321
jewinpyx0:
322322
name: JE (Windows no pyxes)
323-
if: ${{ false }}
323+
# if: ${{ false }}
324324
runs-on: windows-2022
325325
steps:
326326
- name: Checkout Git repository
@@ -334,9 +334,9 @@ jobs:
334334
- name: Build JE (Windows no pyxes)
335335
shell: cmd
336336
env:
337+
NASM: ${{github.workspace}}\openssl-asm\nasm
337338
USE_PYXES: 0
338339
USE_EMU_AVX: 1
339-
_DEBUG: 0
340340
run: |
341341
script\buildga.cmd x64
342342
@@ -345,14 +345,13 @@ jobs:
345345
env:
346346
USE_PYXES: 0
347347
USE_EMU_AVX: 1
348-
_DEBUG: 0
349348
run: |
350349
script\testga.cmd x64
351350
352351
# windows no emu -------------------------------------------------------
353352
jewinemu0:
354353
name: JE (Windows no emu)
355-
if: ${{ false }}
354+
# if: ${{ false }}
356355
runs-on: windows-2022
357356
steps:
358357
- name: Checkout Git repository
@@ -366,9 +365,9 @@ jobs:
366365
- name: Build JE (Windows no emu)
367366
shell: cmd
368367
env:
368+
NASM: ${{github.workspace}}\openssl-asm\nasm
369369
USE_PYXES: 1
370370
USE_EMU_AVX: 0
371-
_DEBUG: 0
372371
run: |
373372
script\buildga.cmd x64
374373
@@ -377,14 +376,13 @@ jobs:
377376
env:
378377
USE_PYXES: 1
379378
USE_EMU_AVX: 0
380-
_DEBUG: 0
381379
run: |
382380
script\testga.cmd x64
383381
384382
# windows no pyxes/emu -------------------------------------------------
385383
jewinpyxemu0:
386384
name: JE (Windows no pyxes/emu)
387-
if: ${{ false }}
385+
# if: ${{ false }}
388386
runs-on: windows-2022
389387
steps:
390388
- name: Checkout Git repository
@@ -398,9 +396,9 @@ jobs:
398396
- name: Build JE (Windows no pyxes/emu)
399397
shell: cmd
400398
env:
399+
NASM: ${{github.workspace}}\openssl-asm\nasm
401400
USE_PYXES: 0
402401
USE_EMU_AVX: 0
403-
_DEBUG: 0
404402
run: |
405403
script\buildga.cmd x64
406404
@@ -409,14 +407,13 @@ jobs:
409407
env:
410408
USE_PYXES: 0
411409
USE_EMU_AVX: 0
412-
_DEBUG: 0
413410
run: |
414411
script\testga.cmd x64
415412
416413
# windows arm64 no pyxes ------------------------------------------------
417414
jewinarm64pyx0:
418415
name: JE (Windows arm64 no pyxes)
419-
if: ${{ false }}
416+
# if: ${{ false }}
420417
runs-on: windows-11-arm
421418
steps:
422419
- name: Checkout Git repository
@@ -432,7 +429,6 @@ jobs:
432429
env:
433430
USE_PYXES: 0
434431
USE_EMU_AVX: 1
435-
_DEBUG: 0
436432
run: |
437433
script\buildga.cmd arm64
438434
@@ -441,14 +437,13 @@ jobs:
441437
env:
442438
USE_PYXES: 0
443439
USE_EMU_AVX: 1
444-
_DEBUG: 0
445440
run: |
446441
script\testga.cmd arm64
447442
448443
# windows arm64 no emu --------------------------------------------------
449444
jewinarm64emu0:
450445
name: JE (Windows arm64 no emu)
451-
if: ${{ false }}
446+
# if: ${{ false }}
452447
runs-on: windows-11-arm
453448
steps:
454449
- name: Checkout Git repository
@@ -464,7 +459,6 @@ jobs:
464459
env:
465460
USE_PYXES: 1
466461
USE_EMU_AVX: 0
467-
_DEBUG: 0
468462
run: |
469463
script\buildga.cmd arm64
470464
@@ -473,14 +467,13 @@ jobs:
473467
env:
474468
USE_PYXES: 1
475469
USE_EMU_AVX: 0
476-
_DEBUG: 0
477470
run: |
478471
script\testga.cmd arm64
479472
480473
# windows arm64 no pyxes/emu --------------------------------------------
481474
jewinarm64pyxemu0:
482475
name: JE (Windows arm64 no pyxes/emu)
483-
if: ${{ false }}
476+
# if: ${{ false }}
484477
runs-on: windows-11-arm
485478
steps:
486479
- name: Checkout Git repository
@@ -496,7 +489,6 @@ jobs:
496489
env:
497490
USE_PYXES: 0
498491
USE_EMU_AVX: 0
499-
_DEBUG: 0
500492
run: |
501493
script\buildga.cmd arm64
502494
@@ -505,14 +497,13 @@ jobs:
505497
env:
506498
USE_PYXES: 0
507499
USE_EMU_AVX: 0
508-
_DEBUG: 0
509500
run: |
510501
script\testga.cmd arm64
511502
512503
# linux32 --------------------------------------------------------------
513504
jelinux32pyx1:
514505
name: JE (Linux32 pyxes)
515-
if: ${{ false }}
506+
# if: ${{ false }}
516507
runs-on: ubuntu-22.04
517508
steps:
518509
- name: Checkout Git repository
@@ -533,14 +524,13 @@ jobs:
533524
USE_OPENMP: 0
534525
USE_PYXES: 1
535526
USE_EMU_AVX: 0
536-
_DEBUG: 0
537527
run: |
538-
script/buildga.sh linux32 || exit 1
528+
script/buildga.sh linux i386 || exit 1
539529
540530
# rpi32arm -------------------------------------------------------------
541531
jerpi32armpyx1:
542532
name: JE (Linux arm32 pyxes)
543-
if: ${{ false }}
533+
# if: ${{ false }}
544534
runs-on: ubuntu-24.04-arm
545535
steps:
546536
- name: Checkout Git repository
@@ -558,6 +548,5 @@ jobs:
558548
USE_OPENMP: 0
559549
USE_PYXES: 1
560550
USE_EMU_AVX: 0
561-
_DEBUG: 0
562551
run: |
563552
script/buildga.sh raspberry armv6l || exit 1

‎jsrc/a.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ F1(jtbdot){F12IP;A b,h=0;I j=0,n,*v;
9696
#define INITHASH(tbl,x,y) ((((UI4)(7*(UI)x+10495464745870458733U*(UI)y))*(UIL)AN(tbl))>>32) // starting hash index for a given x,y
9797
#define LOCKLOC ht3->lock
9898
#else
99-
#define INITHASH(tbl,x,y) (((UI4)(7*(UI)x+10495464745870458733U*(UI)y))*(UIL)AN(tbl))>>32; // starting hash index for a given x,y
99+
#define INITHASH(tbl,x,y) ((((UI4)(7*(UI)x+10495464745870458733U*(UI)y))*(UIL)AN(tbl))>>32) // starting hash index for a given x,y
100100
#define LOCKLOC jt->etxn1 // any address will do, since locks are NOPs in 32-bit
101101
#endif
102102

0 commit comments

Comments
 (0)