Changeset 3673
- Timestamp:
- 2005年04月09日 18時24分20秒 (4 years ago)
- Files:
-
- branches/2.2/src/ChangeLog.Meadow (modified) (1 diff)
- branches/2.2/src/lisp.h (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/2.2/src/ChangeLog.Meadow
r3672 r3673 1 2005-04-09 MIYOSHI Masanori <miyoshi@meadowy.org> 2 3 * lisp.h (MARKBIT): Removed. 4 (XMARKBIT): Ditto. 5 (XSETMARKBIT): Ditto. 6 (XMARK): Ditto. 7 (XUNMARK): Ditto. 8 1 9 2005-04-09 MIYOSHI Masanori <miyoshi@meadowy.org> 2 10 branches/2.2/src/lisp.h
r3671 r3673 256 256 are defined differently by the m- file. */ 257 257 258 #define MARKBIT ((EMACS_INT) ((EMACS_UINT) 1 << (VALBITS + GCTYPEBITS)))259 260 258 /* In the size word of a vector, this bit means the vector has been marked. */ 261 259 … … 378 376 #define XSETFASTINT(a, b) ((a) = make_number (b)) 379 377 380 #ifdef HAVE_SHM381 /* In this representation, data is found in two widely separated segments. */382 extern int pure_size;383 #define XPNTR(a) \384 (XUINT (a) | (XUINT (a) > pure_size ? DATA_SEG_BITS : PURE_SEG_BITS))385 #else /* not HAVE_SHM */386 #ifdef DATA_SEG_BITS387 /* This case is used for the rt-pc.388 In the diffs I was given, it checked for ptr = 0389 and did not adjust it in that case.390 But I don't think that zero should ever be found391 in a Lisp object whose data type says it points to something. */392 #define XPNTR(a) (XUINT (a) | DATA_SEG_BITS)393 #else394 378 #define XPNTR(a) XUINT (a) 395 #endif 396 #endif /* not HAVE_SHM */ 379 397 380 #else /* not USE_LSB_TAG */ 398 381 … … 438 421 439 422 #define EQ(x, y) ((x) == (y)) 440 441 #define XMARKBIT(a) ((a) < 0)442 #define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0))443 #define XMARK(a) ((a) |= MARKBIT)444 #define XUNMARK(a) ((a) &= ~MARKBIT)445 423 446 424 #else /* not NO_UNION_TYPE */
