Skip to content

Commit 6da1910

Browse files
committed
32-bit compile, and allow to run on MSVC (extra parms in equ)
1 parent 33d7de7 commit 6da1910

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

jsrc/m.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,7 +1361,9 @@ printf("%p-\n",w);
13611361
DO((allocsize>>LGSZI), if(i!=6)((I*)w)[i] = (I)0xdeadbeefdeadbeefLL;); // wipe the block clean before we free it - but not the reserved area
13621362
#endif
13631363
allocsize+=TAILPAD+ALIGNTOCACHE*CACHELINESIZE; // the actual allocation had a tail pad and boundary
1364+
#if PYXES
13641365
jt=JTFORTHREAD(jt,origthread); // switch to the thread the block came from
1366+
#endif
13651367
__atomic_fetch_sub(&jt->bytes,allocsize,__ATOMIC_ACQ_REL); // keep track of total allocation
13661368
__atomic_fetch_sub(&jt->malloctotal,allocsize,__ATOMIC_ACQ_REL);
13671369
__atomic_fetch_sub(&jt->mfreegenallo,allocsize,__ATOMIC_ACQ_REL); // account for all the bytes returned to the OS

jsrc/v1.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
// To reduce parameter overhead, we call matchsub with trailing parameters omitted if x==0. This is fine for clang. In MSVC, the parameter area
1515
// is used as a workarea by the routine, and thus omitting the parms makes for a segfault.
16-
#if defined(__clang__)
16+
#if defined(__clang__)&&SY_64
1717
#define MATCHSUBDEFAULTS
1818
#else
1919
#define MATCHSUBDEFAULTS ,0,0,1,1,1

0 commit comments

Comments
 (0)