Mercurial > emacs
annotate src/w32heap.c @ 111067:e36c65ac23bf
Merge changes made in Gnus trunk.
nnimap.el (nnimap-insert-partial-structure): Fix boundary detection.
spam.el (spam-list-of-processors): Mark as obsolete.
gnus-art.el (gnus-blocked-images): New function. Allow the `gnus-blocked-images' to be a function.
gnus-art.el (gnus-article-wash-function): Remove it, and use `mm-text-html-renderer' instead.
mm-decode.el (mm-inline-text-html-renderer): Removed.
mm-decode.el (mm-inline-media-tests): Removed use.
mm-view.el (mm-inline-text-html): Removed use.
mm-view.el (mm-text-html-renderer-alist): Add the `shr' and `gnus-w3m' symbols.
gnus.texi (Article Washing): shr and gnus-w3m, not the direct function names.
gnus-art.el (article-wash-html): Simplify and remove the charset stuff. Use the normal html rendering code instead of the special html washing code.
mm-view.el (mm-text-html-washer-alist): Removed.
gnus-news.texi: Mention that mm-text-html-renderer is the only HTML variable now.
shr.el (shr-tag-table): Remove useless nconc.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 20 Oct 2010 22:29:38 +0000 |
parents | b8fde5ef9e14 |
children | 3207606734d5 |
rev | line source |
---|---|
16884
36babc489b0c
Change all uses of win95, winnt, and win32
Geoff Voelker <voelker@cs.washington.edu>
parents:
16593
diff
changeset
|
1 /* Heap management routines for GNU Emacs on the Microsoft W32 API. |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
2 Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
106815 | 3 2008, 2009, 2010 Free Software Foundation, Inc. |
9803 | 4 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12452
diff
changeset
|
5 This file is part of GNU Emacs. |
9803 | 6 |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
7 GNU Emacs is free software: you can redistribute it and/or modify |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12452
diff
changeset
|
8 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
9 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
10 (at your option) any later version. |
9803 | 11 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12452
diff
changeset
|
12 GNU Emacs is distributed in the hope that it will be useful, |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12452
diff
changeset
|
13 but WITHOUT ANY WARRANTY; without even the implied warranty of |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12452
diff
changeset
|
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12452
diff
changeset
|
15 GNU General Public License for more details. |
9803 | 16 |
14186
ee40177f6c68
Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents:
12452
diff
changeset
|
17 You should have received a copy of the GNU General Public License |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
18 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
9803 | 19 |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
79759
diff
changeset
|
20 /* |
9803 | 21 Geoff Voelker (voelker@cs.washington.edu) 7-29-94 |
22 */ | |
23 | |
42469 | 24 #ifdef HAVE_CONFIG_H |
25 #include <config.h> | |
26 #endif | |
12452
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
27 |
9803 | 28 #include <stdio.h> |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100951
diff
changeset
|
29 #include <setjmp.h> |
9803 | 30 |
16593
4ed80eda6fac
Use new names for w32 files
Geoff Voelker <voelker@cs.washington.edu>
parents:
16588
diff
changeset
|
31 #include "w32heap.h" |
15143
d7d0413e95e2
Include lisp.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
32 #include "lisp.h" /* for VALMASK */ |
9803 | 33 |
31111
14beb147ec06
[!USE_CRT_DLL]: Don't define _heap_init and _heap_term
Andrew Innes <andrewi@gnu.org>
parents:
24886
diff
changeset
|
34 #define RVA_TO_PTR(rva) ((unsigned char *)((DWORD)(rva) + (DWORD)GetModuleHandle (NULL))) |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
35 |
9803 | 36 /* This gives us the page size and the size of the allocation unit on NT. */ |
37 SYSTEM_INFO sysinfo_cache; | |
24886
fb9574318fa0
w32heap.c (osinfo_cache): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24103
diff
changeset
|
38 |
fb9574318fa0
w32heap.c (osinfo_cache): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24103
diff
changeset
|
39 /* This gives us version, build, and platform identification. */ |
fb9574318fa0
w32heap.c (osinfo_cache): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24103
diff
changeset
|
40 OSVERSIONINFO osinfo_cache; |
fb9574318fa0
w32heap.c (osinfo_cache): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24103
diff
changeset
|
41 |
12452
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
42 unsigned long syspage_mask = 0; |
9803 | 43 |
44 /* The major and minor versions of NT. */ | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
15228
diff
changeset
|
45 int w32_major_version; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
15228
diff
changeset
|
46 int w32_minor_version; |
33215
38e1998861ff
(w32_build_number): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
31111
diff
changeset
|
47 int w32_build_number; |
9803 | 48 |
19708
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
49 /* Distinguish between Windows NT and Windows 95. */ |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
50 int os_subtype; |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
51 |
9803 | 52 /* Cache information describing the NT system for later use. */ |
53 void | |
54 cache_system_info (void) | |
55 { | |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
56 union |
9803 | 57 { |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
58 struct info |
9803 | 59 { |
60 char major; | |
61 char minor; | |
62 short platform; | |
63 } info; | |
64 DWORD data; | |
65 } version; | |
66 | |
67 /* Cache the version of the operating system. */ | |
68 version.data = GetVersion (); | |
16588
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
15228
diff
changeset
|
69 w32_major_version = version.info.major; |
481b7874a1e9
Change identifiers of the form win32* to w32*.
Geoff Voelker <voelker@cs.washington.edu>
parents:
15228
diff
changeset
|
70 w32_minor_version = version.info.minor; |
9803 | 71 |
19708
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
72 if (version.info.platform & 0x8000) |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
73 os_subtype = OS_WIN95; |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
74 else |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
75 os_subtype = OS_NT; |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
76 |
9803 | 77 /* Cache page size, allocation unit, processor type, etc. */ |
78 GetSystemInfo (&sysinfo_cache); | |
12452
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
79 syspage_mask = sysinfo_cache.dwPageSize - 1; |
24886
fb9574318fa0
w32heap.c (osinfo_cache): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24103
diff
changeset
|
80 |
fb9574318fa0
w32heap.c (osinfo_cache): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24103
diff
changeset
|
81 /* Cache os info. */ |
fb9574318fa0
w32heap.c (osinfo_cache): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24103
diff
changeset
|
82 osinfo_cache.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); |
fb9574318fa0
w32heap.c (osinfo_cache): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
24103
diff
changeset
|
83 GetVersionEx (&osinfo_cache); |
33215
38e1998861ff
(w32_build_number): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
31111
diff
changeset
|
84 |
38e1998861ff
(w32_build_number): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
31111
diff
changeset
|
85 w32_build_number = osinfo_cache.dwBuildNumber; |
38e1998861ff
(w32_build_number): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
31111
diff
changeset
|
86 if (os_subtype == OS_WIN95) |
38e1998861ff
(w32_build_number): New variable.
Andrew Innes <andrewi@gnu.org>
parents:
31111
diff
changeset
|
87 w32_build_number &= 0xffff; |
9803 | 88 } |
89 | |
18506
bcc706aedcea
Add pragma to force zero initialized
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
90 /* Emulate getpagesize. */ |
bcc706aedcea
Add pragma to force zero initialized
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
91 int |
bcc706aedcea
Add pragma to force zero initialized
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
92 getpagesize (void) |
bcc706aedcea
Add pragma to force zero initialized
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
93 { |
bcc706aedcea
Add pragma to force zero initialized
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
94 return sysinfo_cache.dwPageSize; |
bcc706aedcea
Add pragma to force zero initialized
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
95 } |
bcc706aedcea
Add pragma to force zero initialized
Geoff Voelker <voelker@cs.washington.edu>
parents:
16884
diff
changeset
|
96 |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
97 /* Info for managing our preload heap, which is essentially a fixed size |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
98 data area in the executable. */ |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
99 PIMAGE_SECTION_HEADER preload_heap_section; |
9803 | 100 |
101 /* Info for keeping track of our heap. */ | |
102 unsigned char *data_region_base = NULL; | |
103 unsigned char *data_region_end = NULL; | |
12452
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
104 unsigned char *real_data_region_end = NULL; |
11943
ea533622fb8b
(reserved_heap_size,allocate_heap): Defined.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11385
diff
changeset
|
105 unsigned long reserved_heap_size = 0; |
9803 | 106 |
107 /* The start of the data segment. */ | |
108 unsigned char * | |
109 get_data_start (void) | |
110 { | |
111 return data_region_base; | |
112 } | |
113 | |
114 /* The end of the data segment. */ | |
115 unsigned char * | |
116 get_data_end (void) | |
117 { | |
118 return data_region_end; | |
119 } | |
120 | |
11943
ea533622fb8b
(reserved_heap_size,allocate_heap): Defined.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11385
diff
changeset
|
121 static char * |
ea533622fb8b
(reserved_heap_size,allocate_heap): Defined.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11385
diff
changeset
|
122 allocate_heap (void) |
ea533622fb8b
(reserved_heap_size,allocate_heap): Defined.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11385
diff
changeset
|
123 { |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
124 /* Try to get as much as possible of the address range from the end of |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
125 the preload heap section up to the usable address limit. Since GNU |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
126 malloc can handle gaps in the memory it gets from sbrk, we can |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
127 simply set the sbrk pointer to the base of the new heap region. */ |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
128 unsigned long base = |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
129 ROUND_UP ((RVA_TO_PTR (preload_heap_section->VirtualAddress) |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
130 + preload_heap_section->Misc.VirtualSize), |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
131 get_allocation_unit ()); |
15143
d7d0413e95e2
Include lisp.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
14186
diff
changeset
|
132 unsigned long end = 1 << VALBITS; /* 256MB */ |
15208
01588278fceb
(allocate_heap): Bump heap base up to 27MB to
Geoff Voelker <voelker@cs.washington.edu>
parents:
15143
diff
changeset
|
133 void *ptr = NULL; |
11943
ea533622fb8b
(reserved_heap_size,allocate_heap): Defined.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11385
diff
changeset
|
134 |
15208
01588278fceb
(allocate_heap): Bump heap base up to 27MB to
Geoff Voelker <voelker@cs.washington.edu>
parents:
15143
diff
changeset
|
135 while (!ptr && (base < end)) |
01588278fceb
(allocate_heap): Bump heap base up to 27MB to
Geoff Voelker <voelker@cs.washington.edu>
parents:
15143
diff
changeset
|
136 { |
01588278fceb
(allocate_heap): Bump heap base up to 27MB to
Geoff Voelker <voelker@cs.washington.edu>
parents:
15143
diff
changeset
|
137 reserved_heap_size = end - base; |
01588278fceb
(allocate_heap): Bump heap base up to 27MB to
Geoff Voelker <voelker@cs.washington.edu>
parents:
15143
diff
changeset
|
138 ptr = VirtualAlloc ((void *) base, |
01588278fceb
(allocate_heap): Bump heap base up to 27MB to
Geoff Voelker <voelker@cs.washington.edu>
parents:
15143
diff
changeset
|
139 get_reserved_heap_size (), |
01588278fceb
(allocate_heap): Bump heap base up to 27MB to
Geoff Voelker <voelker@cs.washington.edu>
parents:
15143
diff
changeset
|
140 MEM_RESERVE, |
01588278fceb
(allocate_heap): Bump heap base up to 27MB to
Geoff Voelker <voelker@cs.washington.edu>
parents:
15143
diff
changeset
|
141 PAGE_NOACCESS); |
01588278fceb
(allocate_heap): Bump heap base up to 27MB to
Geoff Voelker <voelker@cs.washington.edu>
parents:
15143
diff
changeset
|
142 base += 0x00100000; /* 1MB increment */ |
01588278fceb
(allocate_heap): Bump heap base up to 27MB to
Geoff Voelker <voelker@cs.washington.edu>
parents:
15143
diff
changeset
|
143 } |
15228
ae9888a75348
(allocate_heap): Clean up conditional.
Richard M. Stallman <rms@gnu.org>
parents:
15208
diff
changeset
|
144 |
15208
01588278fceb
(allocate_heap): Bump heap base up to 27MB to
Geoff Voelker <voelker@cs.washington.edu>
parents:
15143
diff
changeset
|
145 return ptr; |
11943
ea533622fb8b
(reserved_heap_size,allocate_heap): Defined.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11385
diff
changeset
|
146 } |
ea533622fb8b
(reserved_heap_size,allocate_heap): Defined.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11385
diff
changeset
|
147 |
ea533622fb8b
(reserved_heap_size,allocate_heap): Defined.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11385
diff
changeset
|
148 |
9803 | 149 /* Emulate Unix sbrk. */ |
150 void * | |
151 sbrk (unsigned long increment) | |
152 { | |
153 void *result; | |
154 long size = (long) increment; | |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
155 |
9803 | 156 result = data_region_end; |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
157 |
9803 | 158 /* If size is negative, shrink the heap by decommitting pages. */ |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
159 if (size < 0) |
9803 | 160 { |
12452
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
161 int new_size; |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
162 unsigned char *new_data_region_end; |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
163 |
9803 | 164 size = -size; |
165 | |
166 /* Sanity checks. */ | |
167 if ((data_region_end - size) < data_region_base) | |
168 return NULL; | |
169 | |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
170 /* We can only decommit full pages, so allow for |
12452
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
171 partial deallocation [cga]. */ |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
172 new_data_region_end = (data_region_end - size); |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
173 new_data_region_end = (unsigned char *) |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
174 ((long) (new_data_region_end + syspage_mask) & ~syspage_mask); |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
175 new_size = real_data_region_end - new_data_region_end; |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
176 real_data_region_end = new_data_region_end; |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
177 if (new_size > 0) |
12452
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
178 { |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
179 /* Decommit size bytes from the end of the heap. */ |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
180 if (using_dynamic_heap |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
181 && !VirtualFree (real_data_region_end, new_size, MEM_DECOMMIT)) |
12452
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
182 return NULL; |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
183 } |
9803 | 184 |
185 data_region_end -= size; | |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
186 } |
9803 | 187 /* If size is positive, grow the heap by committing reserved pages. */ |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
188 else if (size > 0) |
9803 | 189 { |
190 /* Sanity checks. */ | |
191 if ((data_region_end + size) > | |
192 (data_region_base + get_reserved_heap_size ())) | |
193 return NULL; | |
194 | |
195 /* Commit more of our heap. */ | |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
196 if (using_dynamic_heap |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
197 && VirtualAlloc (data_region_end, size, MEM_COMMIT, |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
198 PAGE_READWRITE) == NULL) |
9803 | 199 return NULL; |
200 data_region_end += size; | |
12452
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
201 |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
202 /* We really only commit full pages, so record where |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
203 the real end of committed memory is [cga]. */ |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
204 real_data_region_end = (unsigned char *) |
bd304be0b491
Include config.h.
Geoff Voelker <voelker@cs.washington.edu>
parents:
11943
diff
changeset
|
205 ((long) (data_region_end + syspage_mask) & ~syspage_mask); |
9803 | 206 } |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
207 |
9803 | 208 return result; |
209 } | |
210 | |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
211 /* Initialize the internal heap variables used by sbrk. When running in |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
212 preload phase (ie. in the undumped executable), we rely entirely on a |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
213 fixed size heap section included in the .exe itself; this is |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
214 preserved during dumping, and truncated to the size actually used. |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
215 |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
216 When running in the dumped executable, we reserve as much as possible |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
217 of the address range that is addressable by Lisp object pointers, to |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
218 supplement what is left of the preload heap. Although we cannot rely |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
219 on the dynamically allocated arena being contiguous with the static |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
220 heap area, it is not a problem because sbrk can pretend that the gap |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
221 was allocated by something else; GNU malloc detects when there is a |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
222 jump in the sbrk values, and starts a new heap block. */ |
9803 | 223 void |
109152
e27859da5624
src/w32*.c: Convert function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
224 init_heap (void) |
9803 | 225 { |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
226 PIMAGE_DOS_HEADER dos_header; |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
227 PIMAGE_NT_HEADERS nt_header; |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
228 |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
229 dos_header = (PIMAGE_DOS_HEADER) RVA_TO_PTR (0); |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
230 nt_header = (PIMAGE_NT_HEADERS) (((unsigned long) dos_header) + |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
231 dos_header->e_lfanew); |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
232 preload_heap_section = find_section ("EMHEAP", nt_header); |
9803 | 233 |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
234 if (using_dynamic_heap) |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
235 { |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
236 data_region_base = allocate_heap (); |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
237 if (!data_region_base) |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
238 { |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
239 printf ("Error: Could not reserve dynamic heap area.\n"); |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
240 exit (1); |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
241 } |
9803 | 242 |
96602 | 243 #if !defined (USE_LISP_UNION_TYPE) && !defined (USE_LSB_TAG) |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
244 /* Ensure that the addresses don't use the upper tag bits since |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
245 the Lisp type goes there. */ |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
246 if (((unsigned long) data_region_base & ~VALMASK) != 0) |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
247 { |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
248 printf ("Error: The heap was allocated in upper memory.\n"); |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
249 exit (1); |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
250 } |
55661
272f0851d05e
[USE_LSB_TAG]: Don't check heap location.
Jason Rumney <jasonr@gnu.org>
parents:
52401
diff
changeset
|
251 #endif |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
252 data_region_end = data_region_base; |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
253 real_data_region_end = data_region_end; |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
254 } |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
255 else |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
256 { |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
257 data_region_base = RVA_TO_PTR (preload_heap_section->VirtualAddress); |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
258 data_region_end = data_region_base; |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
259 real_data_region_end = data_region_end; |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
260 reserved_heap_size = preload_heap_section->Misc.VirtualSize; |
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
261 } |
19708
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
262 |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
263 /* Update system version information to match current system. */ |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
264 cache_system_info (); |
9803 | 265 } |
266 | |
267 /* Round the heap up to the given alignment. */ | |
268 void | |
269 round_heap (unsigned long align) | |
270 { | |
271 unsigned long needs_to_be; | |
272 unsigned long need_to_alloc; | |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
273 |
24103
4adfa5300fd8
(RVA_TO_PTR): Redefine to convert RVA to address in
Andrew Innes <andrewi@gnu.org>
parents:
23171
diff
changeset
|
274 needs_to_be = (unsigned long) ROUND_UP (get_heap_end (), align); |
9803 | 275 need_to_alloc = needs_to_be - (unsigned long) get_heap_end (); |
48046
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
276 |
e81472bb5044
Don't redefine _heap_init and _heap_term on MSVC 7 build environments. Patch
Juanma Barranquero <lekktu@gmail.com>
parents:
42469
diff
changeset
|
277 if (need_to_alloc) |
9803 | 278 sbrk (need_to_alloc); |
279 } | |
19708
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
280 |
110994
734b2470f93c
src/w32*.c: Whitespace fixes and typos.
Juanma Barranquero <lekktu@gmail.com>
parents:
106815
diff
changeset
|
281 #if (_MSC_VER >= 1000 && _MSC_VER < 1300 && !defined (USE_CRT_DLL)) |
19708
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
282 |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
283 /* MSVC 4.2 invokes these functions from mainCRTStartup to initialize |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
284 a heap via HeapCreate. They are normally defined by the runtime, |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
285 but we override them here so that the unnecessary HeapCreate call |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
286 is not performed. */ |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
287 |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
288 int __cdecl |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
289 _heap_init (void) |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
290 { |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
291 /* Stepping through the assembly indicates that mainCRTStartup is |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
292 expecting a nonzero success return value. */ |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
293 return 1; |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
294 } |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
295 |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
296 void __cdecl |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
297 _heap_term (void) |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
298 { |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
299 return; |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
300 } |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
301 |
16e69fbdbf0f
(os_subtype): New variable.
Geoff Voelker <voelker@cs.washington.edu>
parents:
18506
diff
changeset
|
302 #endif |
52401 | 303 |
304 /* arch-tag: 9a6a9860-040d-422d-8905-450dd535cd9c | |
305 (do not change this comment) */ |