(scan_sexps_forward): Prefer 2-char comment-starter over a 1-char one.

[bpt/emacs.git] / src / w32heap.h

diff --git a/src/w32heap.h b/src/w32heap.h
index b3c01d3..7fdf952 100644 (file)
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -26,6 +26,9 @@ Boston, MA 02111-1307, USA.
 
 #include <windows.h>
 
+#define ROUND_UP(p, align)   (((DWORD)(p) + (align)-1) & ~((align)-1))
+#define ROUND_DOWN(p, align) ((DWORD)(p) & ~((align)-1))
+
 /*
  * Heap related stuff.
  */
@@ -36,38 +39,70 @@ Boston, MA 02111-1307, USA.
 #define get_page_size()                        sysinfo_cache.dwPageSize
 #define get_allocation_unit()          sysinfo_cache.dwAllocationGranularity
 #define get_processor_type()           sysinfo_cache.dwProcessorType
-#define get_nt_major_version()         nt_major_version
-#define get_nt_minor_version()         nt_minor_version
+#define get_w32_major_version()        w32_major_version
+#define get_w32_minor_version()        w32_minor_version
 
 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 int           nt_major_version;
-extern int           nt_minor_version;
+extern OSVERSIONINFO  osinfo_cache;
+extern BOOL          using_dynamic_heap;
+extern int           w32_major_version;
+extern int           w32_minor_version;
+extern int           w32_build_number;
+
+enum {
+  OS_WIN95 = 1,
+  OS_NT
+};
+
+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);
+/* ----------------------------------------------------------------- */
+/* Useful routines for manipulating memory-mapped files. */
+
+typedef struct file_data {
+    char          *name;
+    unsigned long  size;
+    HANDLE         file;
+    HANDLE         file_mapping;
+    unsigned char *file_base;
+} file_data;
+
+#define OFFSET_TO_RVA(var,section) \
+         (section->VirtualAddress + ((DWORD)(var) - section->PointerToRawData))
+
+#define RVA_TO_OFFSET(var,section) \
+         (section->PointerToRawData + ((DWORD)(var) - section->VirtualAddress))
+
+#define RVA_TO_PTR(var,section,filedata) \
+         ((void *)(RVA_TO_OFFSET(var,section) + (filedata).file_base))
+
+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);
+
+/* Return pointer to section header for named section. */
+IMAGE_SECTION_HEADER * find_section (char * name, IMAGE_NT_HEADERS * nt_header);
+
+/* Return pointer to section header for section containing the given
+   relative virtual address. */
+IMAGE_SECTION_HEADER * rva_to_section (DWORD rva, IMAGE_NT_HEADERS * nt_header);
 
 #endif /* NTHEAP_H_ */
+
+/* arch-tag: 3ba4cbe1-8a09-4a41-8f37-fd31f7426b3c
+   (do not change this comment) */