@@ -9,43 +9,44 @@ extern "C" {
9
9
#endif
10
10
11
11
12
- #define PTA (x ) ((poolp )((uint8_t *)&(usedpools[2*(x)]) - 2*sizeof(pymem_block *)))
13
- #define PT (x ) PTA(x), PTA(x)
12
+ #define PTA (pools , x ) \
13
+ ((poolp )((uint8_t *)&(pools.used[2*(x)]) - 2*sizeof(pymem_block *)))
14
+ #define PT (p , x ) PTA(p, x), PTA(p, x)
14
15
15
- #define PT_8 (start ) \
16
- PT(start ), PT(start +1), PT(start +2), PT(start +3), PT(start +4), PT(start +5), PT(start +6), PT(start +7)
16
+ #define PT_8 (p , st ) \
17
+ PT(p, st ), PT(p, st +1), PT(p, st +2), PT(p, st +3), PT(p, st +4), PT(p, st +5), PT(p, st +6), PT(p, st +7)
17
18
18
19
#if NB_SMALL_SIZE_CLASSES <= 8
19
- # define _obmalloc_pools_INIT \
20
- { PT_8(0) }
20
+ # define _obmalloc_pools_INIT ( p ) \
21
+ { PT_8(p, 0) }
21
22
#elif NB_SMALL_SIZE_CLASSES <= 16
22
- # define _obmalloc_pools_INIT \
23
- { PT_8(0), PT_8(8) }
23
+ # define _obmalloc_pools_INIT ( p ) \
24
+ { PT_8(p, 0), PT_8(p, 8) }
24
25
#elif NB_SMALL_SIZE_CLASSES <= 24
25
- # define _obmalloc_pools_INIT \
26
- { PT_8(0), PT_8(8), PT_8(16) }
26
+ # define _obmalloc_pools_INIT ( p ) \
27
+ { PT_8(p, 0), PT_8(p, 8), PT_8(p, 16) }
27
28
#elif NB_SMALL_SIZE_CLASSES <= 32
28
- # define _obmalloc_pools_INIT \
29
- { PT_8(0), PT_8(8), PT_8(16), PT_8(24) }
29
+ # define _obmalloc_pools_INIT ( p ) \
30
+ { PT_8(p, 0), PT_8(p, 8), PT_8(p, 16), PT_8(p, 24) }
30
31
#elif NB_SMALL_SIZE_CLASSES <= 40
31
- # define _obmalloc_pools_INIT \
32
- { PT_8(0), PT_8(8), PT_8(16), PT_8(24), PT_8(32) }
32
+ # define _obmalloc_pools_INIT ( p ) \
33
+ { PT_8(p, 0), PT_8(p, 8), PT_8(p, 16), PT_8(p, 24), PT_8(p, 32) }
33
34
#elif NB_SMALL_SIZE_CLASSES <= 48
34
- # define _obmalloc_pools_INIT \
35
- { PT_8(0), PT_8(8), PT_8(16), PT_8(24), PT_8(32), PT_8(40) }
35
+ # define _obmalloc_pools_INIT ( p ) \
36
+ { PT_8(p, 0), PT_8(p, 8), PT_8(p, 16), PT_8(p, 24), PT_8(p, 32), PT_8(p, 40) }
36
37
#elif NB_SMALL_SIZE_CLASSES <= 56
37
- # define _obmalloc_pools_INIT \
38
- { PT_8(0), PT_8(8), PT_8(16), PT_8(24), PT_8(32), PT_8(40), PT_8(48) }
38
+ # define _obmalloc_pools_INIT ( p ) \
39
+ { PT_8(p, 0), PT_8(p, 8), PT_8(p, 16), PT_8(p, 24), PT_8(p, 32), PT_8(p, 40), PT_8(p, 48) }
39
40
#elif NB_SMALL_SIZE_CLASSES <= 64
40
- # define _obmalloc_pools_INIT \
41
- { PT_8(0), PT_8(8), PT_8(16), PT_8(24), PT_8(32), PT_8(40), PT_8(48), PT_8(56) }
41
+ # define _obmalloc_pools_INIT ( p ) \
42
+ { PT_8(p, 0), PT_8(p, 8), PT_8(p, 16), PT_8(p, 24), PT_8(p, 32), PT_8(p, 40), PT_8(p, 48), PT_8(p, 56) }
42
43
#else
43
44
# error "NB_SMALL_SIZE_CLASSES should be less than 64"
44
45
#endif
45
46
46
- #define _obmalloc_state_INIT \
47
+ #define _obmalloc_state_INIT ( obmalloc ) \
47
48
{ \
48
- .pools = _obmalloc_pools_INIT, \
49
+ .pools = _obmalloc_pools_INIT(obmalloc.pools) , \
49
50
}
50
51
51
52
0 commit comments