Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2008-05-09 18:50:47 -05:00
commit 3f0640457c
2 changed files with 4 additions and 4 deletions

View File

@ -4,8 +4,8 @@ USING: math kernel layouts system ;
IN: compiler.constants
! These constants must match vm/memory.h
: card-bits 6 ;
: deck-bits 12 ;
: card-bits 8 ;
: deck-bits 18 ;
: card-mark HEX: 40 HEX: 80 bitor ;
! These constants must match vm/layouts.h

View File

@ -70,7 +70,7 @@ the offset of the first object is set by the allocator. */
#define CARD_MARK_MASK (CARD_POINTS_TO_NURSERY | CARD_POINTS_TO_AGING)
typedef u8 F_CARD;
#define CARD_BITS 6
#define CARD_BITS 8
#define CARD_SIZE (1<<CARD_BITS)
#define ADDR_CARD_MASK (CARD_SIZE-1)
@ -81,7 +81,7 @@ DLLEXPORT CELL cards_offset;
typedef u8 F_DECK;
#define DECK_BITS (CARD_BITS + 6)
#define DECK_BITS (CARD_BITS + 10)
#define DECK_SIZE (1<<DECK_BITS)
#define ADDR_DECK_MASK (DECK_SIZE-1)