APPROVE COMMIT 21.5 The pointer lookup table calculates wrong indices for high addresses because it bit shifts signed EMACS_INTs. This patch fixes the bug by using the unsigned version EMACS_UINT. src/ChangeLog addition: 2007-08-17 Marcus Crestani <crestani(a)xemacs.org&gt; * mc-alloc.c (L1_INDEX): * mc-alloc.c (PAGE_SIZE_ALIGNMENT): * mc-alloc.c (set_bit): * mc-alloc.c (init_mc_allocator): Use EMACS_UINT with bit shifting. unsigned-xemacs-21.5 source patch: Diff command: cvs -q diff -u Files affected: src/mc-alloc.c =================================================================== RCS Index: src/mc-alloc.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.c,v retrieving revision 1.11 diff -u -r1.11 mc-alloc.c --- src/mc-alloc.c 15 Aug 2007 11:06:10 -0000 1.11 +++ src/mc-alloc.c 17 Aug 2007 09:53:32 -0000 ＠＠ -179,11 +179,11 ＠＠ #ifdef USE_HASH_TABLE # define HASH(hi) ((hi) & (LEVEL1_SIZE - 1)) -# define L1_INDEX(p) HASH ((EMACS_INT) p >> (LOG_LEVEL2_SIZE + LOG_PAGE_SIZE)) +# define L1_INDEX(p) HASH ((EMACS_UINT) p >> (LOG_LEVEL2_SIZE + LOG_PAGE_SIZE)) #else -# define L1_INDEX(p) ((EMACS_INT) p >> (LOG_LEVEL2_SIZE + LOG_PAGE_SIZE)) +# define L1_INDEX(p) ((EMACS_UINT) p >> (LOG_LEVEL2_SIZE + LOG_PAGE_SIZE)) #endif -#define L2_INDEX(p) (((EMACS_INT) p >> LOG_PAGE_SIZE) & (LEVEL2_SIZE - 1)) +#define L2_INDEX(p) (((EMACS_UINT) p >> LOG_PAGE_SIZE) & (LEVEL2_SIZE - 1)) ＠＠ -393,7 +393,7 ＠＠ #define BYTES_TO_PAGES(bytes) (div_PAGE_SIZE ((bytes + (PAGE_SIZE - 1)))) #define PAGE_SIZE_ALIGNMENT(address) \ - (void *) ((((EMACS_INT) (address)) + PAGE_SIZE) & ~(PAGE_SIZE - 1)) + (void *) ((((EMACS_UINT) (address)) + PAGE_SIZE) & ~(PAGE_SIZE - 1)) #define PH_ON_FREE_LIST_P(ph) \ (ph && PH_PLH (ph) && (PLH_LIST_TYPE (PH_PLH (ph)) == FREE_LIST)) ＠＠ -618,7 +618,7 ＠＠ /* Bit_Arrays bit at pos to val. */ static void -set_bit (Rawbyte *bit_array, EMACS_INT pos, EMACS_INT val) +set_bit (Rawbyte *bit_array, EMACS_INT pos, EMACS_UINT val) { #if N_MARK_BITS > 1 EMACS_INT i; ＠＠ -1648,7 +1648,7 ＠＠ ABORT (); } - page_size_div_2 = (EMACS_INT) SYS_PAGE_SIZE >> 1; + page_size_div_2 = (EMACS_UINT) SYS_PAGE_SIZE >> 1; mc_allocator_globals.used_heap_pages = (page_list_header *) xmalloc_and_zero ((N_USED_PAGE_LISTS + 1) -- Marcus _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches