CVS update by crestani xemacs/src ...

[xemacs-cvs at xemacs.org]

  User: crestani
  Date: 07/08/17 12:16:51

  Modified:    xemacs/src ChangeLog mc-alloc.c
Log:
2007-08-17  Marcus Crestani  <crestani at xemacs.org>

	* 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.

Revision  Changes    Path
1.1088    +8 -0      XEmacs/xemacs/src/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.1087
retrieving revision 1.1088
diff -u -p -r1.1087 -r1.1088
--- ChangeLog	2007/08/17 08:08:05	1.1087
+++ ChangeLog	2007/08/17 10:16:46	1.1088
@@ -1,3 +1,11 @@
+2007-08-17  Marcus Crestani  <crestani at xemacs.org>
+
+	* 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.
+	
 2007-08-15  Marcus Crestani  <crestani at xemacs.org>
 
 	* database.c (dbm_map): Add typecast.



1.12      +6 -6      XEmacs/xemacs/src/mc-alloc.c

Index: mc-alloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/mc-alloc.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- mc-alloc.c	2007/08/15 11:06:10	1.11
+++ mc-alloc.c	2007/08/17 10:16:48	1.12
@@ -179,11 +179,11 @@ static EMACS_INT page_size_div_2;
 
 #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 @@ mc_allocator_globals_type mc_allocator_g
 #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 @@ get_bit (Rawbyte *bit_array, EMACS_INT p
 
 /* 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 @@ init_mc_allocator (void)
       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)