From a5352d98bb5d0c501cd03b2b391be0ee47e558d8 Mon Sep 17 00:00:00 2001 From: Andrew Innes Date: Sun, 17 Jan 1999 19:23:52 +0000 Subject: [PATCH] (ROUND_UP): (ROUND_DOWN): New macros. (need_to_recreate_heap): Renamed to using_dynamic_heap. (init_heap): New extern. (data_region_size): (recreate_heap): (read_in_bss): (map_in_heap): (round_to_next): (w32_fatal_reload_error): (get_section_size): Obsolete externs removed. --- src/w32heap.h | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/w32heap.h b/src/w32heap.h index ae18fd81df..2ff0220577 100644 --- a/src/w32heap.h +++ b/src/w32heap.h @@ -26,6 +26,9 @@ Boston, MA 02111-1307, USA. #include +#define ROUND_UP(p, align) (((DWORD)(p) + (align)-1) & ~((align)-1)) +#define ROUND_DOWN(p, align) ((DWORD)(p) & ~((align)-1)) + /* * Heap related stuff. */ @@ -41,10 +44,9 @@ Boston, MA 02111-1307, USA. extern unsigned char *get_data_start(); extern unsigned char *get_data_end(); -extern unsigned long data_region_size; extern unsigned long reserved_heap_size; extern SYSTEM_INFO sysinfo_cache; -extern BOOL need_to_recreate_heap; +extern BOOL using_dynamic_heap; extern int w32_major_version; extern int w32_minor_version; @@ -58,28 +60,15 @@ extern int os_subtype; /* Emulation of Unix sbrk(). */ extern void *sbrk (unsigned long size); -/* Recreate the heap created during dumping. */ -extern void recreate_heap (char *executable_path); +/* Initialize heap structures for sbrk on startup. */ +extern void init_heap (); /* Round the heap to this size. */ extern void round_heap (unsigned long size); -/* Load in the dumped .bss section. */ -extern void read_in_bss (char *name); - -/* Map in the dumped heap. */ -extern void map_in_heap (char *name); - /* Cache system info, e.g., the NT page size. */ extern void cache_system_info (void); -/* Round ADDRESS up to be aligned with ALIGN. */ -extern unsigned char *round_to_next (unsigned char *address, - unsigned long align); - -/* Report a fatal error during dumped heap management. */ -void w32_fatal_reload_error (char *step); - /* ----------------------------------------------------------------- */ /* Useful routines for manipulating memory-mapped files. */ @@ -104,8 +93,6 @@ int open_input_file (file_data *p_file, char *name); int open_output_file (file_data *p_file, char *name, unsigned long size); void close_file_data (file_data *p_file); -unsigned long get_section_size (PIMAGE_SECTION_HEADER p_section); - /* Return pointer to section header for named section. */ IMAGE_SECTION_HEADER * find_section (char * name, IMAGE_NT_HEADERS * nt_header); -- 2.39.2