Mercurial > projects > ldc
annotate tango/lib/compiler/llvmdc/lifetime.d @ 237:a168a2c3ea48 trunk
[svn r253] Removed -inlineasm option. inline asm is now enabled by default unless the new -noasm option is passed.
Tried adding a stack trace print when compiler crashes, not sure it's working though.
Changed data layouts to match that of llvm-gcc.
Fixed casting function pointers.
Added support checks in AsmStatement.
| author | lindquist |
|---|---|
| date | Sun, 08 Jun 2008 19:09:24 +0200 |
| parents | 4c2689d57ba4 |
| children | 23d0d9855cad |
| rev | line source |
|---|---|
| 132 | 1 /** |
| 2 * This module contains all functions related to an object's lifetime: | |
| 3 * allocation, resizing, deallocation, and finalization. | |
| 4 * | |
| 5 * Copyright: Copyright (C) 2004-2007 Digital Mars, www.digitalmars.com. | |
| 6 * All rights reserved. | |
| 7 * License: | |
| 8 * This software is provided 'as-is', without any express or implied | |
| 9 * warranty. In no event will the authors be held liable for any damages | |
| 10 * arising from the use of this software. | |
| 11 * | |
| 12 * Permission is granted to anyone to use this software for any purpose, | |
| 13 * including commercial applications, and to alter it and redistribute it | |
| 14 * freely, in both source and binary form, subject to the following | |
| 15 * restrictions: | |
| 16 * | |
| 17 * o The origin of this software must not be misrepresented; you must not | |
| 18 * claim that you wrote the original software. If you use this software | |
| 19 * in a product, an acknowledgment in the product documentation would be | |
| 20 * appreciated but is not required. | |
| 21 * o Altered source versions must be plainly marked as such, and must not | |
| 22 * be misrepresented as being the original software. | |
| 23 * o This notice may not be removed or altered from any source | |
| 24 * distribution. | |
| 25 * Authors: Walter Bright, Sean Kelly, Tomas Lindquist Olsen | |
| 26 */ | |
| 27 module lifetime; | |
| 28 | |
|
133
44a95ac7368a
[svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents:
132
diff
changeset
|
29 //debug=PRINTF; |
| 137 | 30 //debug=PRINTF2; |
| 132 | 31 |
|
237
a168a2c3ea48
[svn r253] Removed -inlineasm option. inline asm is now enabled by default unless the new -noasm option is passed.
lindquist
parents:
212
diff
changeset
|
32 // we're not allowed to jump out of asm blocks |
|
a168a2c3ea48
[svn r253] Removed -inlineasm option. inline asm is now enabled by default unless the new -noasm option is passed.
lindquist
parents:
212
diff
changeset
|
33 //version(D_InlineAsm_X86) version = Asm86; |
|
a168a2c3ea48
[svn r253] Removed -inlineasm option. inline asm is now enabled by default unless the new -noasm option is passed.
lindquist
parents:
212
diff
changeset
|
34 |
| 132 | 35 private |
| 36 { | |
| 37 import tango.stdc.stdlib; | |
| 38 import tango.stdc.string; | |
| 39 import tango.stdc.stdarg; | |
| 40 debug(PRINTF) import tango.stdc.stdio; | |
|
133
44a95ac7368a
[svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents:
132
diff
changeset
|
41 else debug(PRINTF2) import tango.stdc.stdio; |
| 132 | 42 } |
| 43 | |
| 44 | |
| 45 private | |
| 46 { | |
| 47 enum BlkAttr : uint | |
| 48 { | |
| 49 FINALIZE = 0b0000_0001, | |
| 50 NO_SCAN = 0b0000_0010, | |
| 51 NO_MOVE = 0b0000_0100, | |
| 52 ALL_BITS = 0b1111_1111 | |
| 53 } | |
| 54 | |
| 55 struct BlkInfo | |
| 56 { | |
| 57 void* base; | |
| 58 size_t size; | |
| 59 uint attr; | |
| 60 } | |
| 61 | |
| 62 extern (C) uint gc_getAttr( void* p ); | |
| 63 extern (C) uint gc_setAttr( void* p, uint a ); | |
| 64 extern (C) uint gc_clrAttr( void* p, uint a ); | |
| 65 | |
| 66 extern (C) void* gc_malloc( size_t sz, uint ba = 0 ); | |
| 67 extern (C) void* gc_calloc( size_t sz, uint ba = 0 ); | |
| 68 extern (C) size_t gc_extend( void* p, size_t mx, size_t sz ); | |
| 69 extern (C) void gc_free( void* p ); | |
| 70 | |
| 71 extern (C) void* gc_addrOf( void* p ); | |
| 72 extern (C) size_t gc_sizeOf( void* p ); | |
| 73 extern (C) BlkInfo gc_query( void* p ); | |
| 74 | |
| 75 extern (C) bool onCollectResource( Object o ); | |
| 76 extern (C) void onFinalizeError( ClassInfo c, Exception e ); | |
| 77 extern (C) void onOutOfMemoryError(); | |
| 78 | |
| 79 extern (C) void _d_monitordelete(Object h, bool det = true); | |
| 80 | |
| 81 enum | |
| 82 { | |
| 83 PAGESIZE = 4096 | |
| 84 } | |
| 85 } | |
| 86 | |
| 87 | |
| 88 /** | |
| 89 * | |
| 90 */ | |
| 91 extern (C) Object _d_newclass(ClassInfo ci) | |
| 92 { | |
| 93 void* p; | |
| 94 | |
| 137 | 95 debug(PRINTF2) printf("_d_newclass(ci = %p, %s)\n", ci, cast(char *)ci.name.ptr); |
|
133
44a95ac7368a
[svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents:
132
diff
changeset
|
96 /+ |
| 132 | 97 if (ci.flags & 1) // if COM object |
| 98 { /* COM objects are not garbage collected, they are reference counted | |
| 99 * using AddRef() and Release(). They get free'd by C's free() | |
| 100 * function called by Release() when Release()'s reference count goes | |
| 101 * to zero. | |
| 102 */ | |
| 103 p = tango.stdc.stdlib.malloc(ci.init.length); | |
| 104 if (!p) | |
| 105 onOutOfMemoryError(); | |
| 106 } | |
| 107 else | |
|
133
44a95ac7368a
[svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents:
132
diff
changeset
|
108 +/ |
| 132 | 109 { |
| 110 p = gc_malloc(ci.init.length, | |
| 111 BlkAttr.FINALIZE | (ci.flags & 2 ? BlkAttr.NO_SCAN : 0)); | |
|
133
44a95ac7368a
[svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents:
132
diff
changeset
|
112 debug(PRINTF2) printf(" p = %p\n", p); |
| 132 | 113 } |
| 114 | |
| 137 | 115 debug(PRINTF2) |
| 132 | 116 { |
| 117 printf("p = %p\n", p); | |
| 137 | 118 printf("ci = %p, ci.init = %p, len = %d\n", ci, ci.init.ptr, ci.init.length); |
| 119 printf("vptr = %p\n", *cast(void**) ci.init.ptr); | |
| 120 printf("vtbl[0] = %p\n", (*cast(void***) ci.init.ptr)[0]); | |
| 121 printf("vtbl[1] = %p\n", (*cast(void***) ci.init.ptr)[1]); | |
| 122 printf("init[0] = %p\n", (cast(uint**) ci.init.ptr)[0]); | |
| 123 printf("init[1] = %p\n", (cast(uint**) ci.init.ptr)[1]); | |
| 124 printf("init[2] = %p\n", (cast(uint**) ci.init.ptr)[2]); | |
| 125 printf("init[3] = %p\n", (cast(uint**) ci.init.ptr)[3]); | |
| 126 printf("init[4] = %p\n", (cast(uint**) ci.init.ptr)[4]); | |
| 132 | 127 } |
| 128 | |
| 129 // initialize it | |
|
133
44a95ac7368a
[svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents:
132
diff
changeset
|
130 // llvmdc does this inline |
|
44a95ac7368a
[svn r137] Many fixes towards tango.io.Console working, but not quite there yet...
lindquist
parents:
132
diff
changeset
|
131 //(cast(byte*) p)[0 .. ci.init.length] = ci.init[]; |
| 132 | 132 |
| 133 debug(PRINTF) printf("initialization done\n"); | |
| 134 return cast(Object) p; | |
| 135 } | |
| 136 | |
| 137 /** | |
| 138 * | |
| 139 */ | |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
140 extern (C) void _d_delinterface(void* p) |
| 132 | 141 { |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
142 if (p) |
| 132 | 143 { |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
144 Interface* pi = **cast(Interface ***)p; |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
145 Object o = cast(Object)(p - pi.offset); |
| 132 | 146 |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
147 _d_delclass(o); |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
148 //*p = null; |
| 132 | 149 } |
| 150 } | |
| 151 | |
| 152 // used for deletion | |
| 153 private extern (D) alias void function(Object) fp_t; | |
| 154 | |
| 155 | |
| 156 /** | |
| 157 * | |
| 158 */ | |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
159 extern (C) void _d_delclass(Object p) |
| 132 | 160 { |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
161 if (p) |
| 132 | 162 { |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
163 debug(PRINTF) printf("_d_delclass(%p)\n", p); |
| 132 | 164 |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
165 ClassInfo **pc = cast(ClassInfo **)p; |
| 132 | 166 if (*pc) |
| 167 { | |
| 168 ClassInfo c = **pc; | |
| 169 | |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
170 rt_finalize(cast(void*) p); |
| 132 | 171 |
| 172 if (c.deallocator) | |
| 173 { | |
| 174 fp_t fp = cast(fp_t)c.deallocator; | |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
175 (*fp)(p); // call deallocator |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
176 //*p = null; |
| 132 | 177 return; |
| 178 } | |
| 179 } | |
| 180 else | |
| 181 { | |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
182 rt_finalize(cast(void*) p); |
| 132 | 183 } |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
184 gc_free(cast(void*) p); |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
185 //*p = null; |
| 132 | 186 } |
| 187 } | |
| 188 | |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
189 /+ |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
190 |
| 132 | 191 /** |
| 192 * | |
| 193 */ | |
| 194 struct Array | |
| 195 { | |
| 196 size_t length; | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
197 void* data; |
| 132 | 198 } |
| 199 | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
200 +/ |
| 132 | 201 |
| 202 /** | |
| 203 * Allocate a new array of length elements. | |
| 204 * ti is the type of the resulting array, or pointer to element. | |
| 205 * (For when the array is initialized to 0) | |
| 206 */ | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
207 extern (C) void* _d_newarrayT(TypeInfo ti, size_t length) |
| 132 | 208 { |
| 209 void* p; | |
| 210 auto size = ti.next.tsize(); // array element size | |
| 211 | |
|
212
4c2689d57ba4
[svn r228] Fixed: when new'ing basic types, the storage was not default initialized.
lindquist
parents:
211
diff
changeset
|
212 debug(PRINTF) printf("_d_newarrayT(length = %u, size = %d)\n", length, size); |
| 132 | 213 if (length == 0 || size == 0) |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
214 return null; |
| 132 | 215 |
|
237
a168a2c3ea48
[svn r253] Removed -inlineasm option. inline asm is now enabled by default unless the new -noasm option is passed.
lindquist
parents:
212
diff
changeset
|
216 version (Asm86) |
| 132 | 217 { |
| 218 asm | |
| 219 { | |
| 220 mov EAX,size ; | |
| 221 mul EAX,length ; | |
| 222 mov size,EAX ; | |
| 223 jc Loverflow ; | |
| 224 } | |
| 225 } | |
| 226 else | |
| 227 size *= length; | |
| 228 p = gc_malloc(size + 1, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0); | |
| 229 debug(PRINTF) printf(" p = %p\n", p); | |
| 230 memset(p, 0, size); | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
231 return p; |
| 132 | 232 |
| 233 Loverflow: | |
| 234 onOutOfMemoryError(); | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
235 return null; |
| 132 | 236 } |
| 237 | |
| 238 /** | |
| 239 * For when the array has a non-zero initializer. | |
| 240 */ | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
241 extern (C) void* _d_newarrayiT(TypeInfo ti, size_t length) |
| 132 | 242 { |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
243 void* result; |
| 132 | 244 auto size = ti.next.tsize(); // array element size |
| 245 | |
| 246 debug(PRINTF) printf("_d_newarrayiT(length = %d, size = %d)\n", length, size); | |
| 247 | |
| 248 if (length == 0 || size == 0) | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
249 result = null; |
| 132 | 250 else |
| 251 { | |
| 252 auto initializer = ti.next.init(); | |
| 253 auto isize = initializer.length; | |
| 254 auto q = initializer.ptr; | |
|
237
a168a2c3ea48
[svn r253] Removed -inlineasm option. inline asm is now enabled by default unless the new -noasm option is passed.
lindquist
parents:
212
diff
changeset
|
255 version (Asm86) |
| 132 | 256 { |
| 257 asm | |
| 258 { | |
| 259 mov EAX,size ; | |
| 260 mul EAX,length ; | |
| 261 mov size,EAX ; | |
| 262 jc Loverflow ; | |
| 263 } | |
| 264 } | |
| 265 else | |
| 266 size *= length; | |
| 267 auto p = gc_malloc(size + 1, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0); | |
| 268 debug(PRINTF) printf(" p = %p\n", p); | |
| 269 if (isize == 1) | |
| 270 memset(p, *cast(ubyte*)q, size); | |
| 271 else if (isize == int.sizeof) | |
| 272 { | |
| 273 int init = *cast(int*)q; | |
| 274 size /= int.sizeof; | |
| 275 for (size_t u = 0; u < size; u++) | |
| 276 { | |
| 277 (cast(int*)p)[u] = init; | |
| 278 } | |
| 279 } | |
| 280 else | |
| 281 { | |
| 282 for (size_t u = 0; u < size; u += isize) | |
| 283 { | |
| 284 memcpy(p + u, q, isize); | |
| 285 } | |
| 286 } | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
287 result = p; |
| 132 | 288 } |
| 289 return result; | |
| 290 | |
| 291 Loverflow: | |
| 292 onOutOfMemoryError(); | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
293 return null; |
| 132 | 294 } |
| 295 | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
296 /+ |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
297 |
| 132 | 298 /** |
| 299 * | |
| 300 */ | |
| 301 extern (C) Array _d_newarraymT(TypeInfo ti, int ndims, ...) | |
| 302 { | |
| 303 Array result; | |
| 304 | |
| 305 debug(PRINTF) printf("_d_newarraymT(ndims = %d)\n", ndims); | |
| 306 if (ndims == 0) | |
| 307 result = Array(); | |
| 308 else | |
| 309 { va_list q; | |
| 310 va_start!(int)(q, ndims); | |
| 311 | |
| 312 void[] foo(TypeInfo ti, size_t* pdim, int ndims) | |
| 313 { | |
| 314 size_t dim = *pdim; | |
| 315 void[] p; | |
| 316 | |
| 317 debug(PRINTF) printf("foo(ti = %p, ti.next = %p, dim = %d, ndims = %d\n", ti, ti.next, dim, ndims); | |
| 318 if (ndims == 1) | |
| 319 { | |
| 320 return _d_newarrayT(ti, dim); | |
| 321 } | |
| 322 else | |
| 323 { | |
| 324 p = gc_malloc(dim * (void[]).sizeof + 1)[0 .. dim]; | |
| 325 for (int i = 0; i < dim; i++) | |
| 326 { | |
| 327 (cast(void[]*)p.ptr)[i] = foo(ti.next, pdim + 1, ndims - 1); | |
| 328 } | |
| 329 } | |
| 330 return p; | |
| 331 } | |
| 332 | |
| 333 size_t* pdim = cast(size_t *)q; | |
| 334 void[] arr = foo(ti, pdim, ndims); | |
| 335 result = Arra | |
| 336 debug(PRINTF) printf("result = %llx\n", result); | |
| 337 | |
| 338 version (none) | |
| 339 { | |
| 340 for (int i = 0; i < ndims; i++) | |
| 341 { | |
| 342 printf("index %d: %d\n", i, va_arg!(int)(q)); | |
| 343 } | |
| 344 } | |
| 345 va_end(q); | |
| 346 } | |
| 347 return result; | |
| 348 } | |
| 349 | |
| 350 | |
| 351 /** | |
| 352 * | |
| 353 */ | |
| 354 extern (C) Array _d_newarraymiT(TypeInfo ti, int ndims, ...) | |
| 355 { | |
| 356 Array result; | |
| 357 | |
| 358 debug(PRINTF) printf("_d_newarraymiT(ndims = %d)\n", ndims); | |
| 359 if (ndims == 0) | |
| 360 result = 0; | |
| 361 else | |
| 362 { | |
| 363 va_list q; | |
| 364 va_start!(int)(q, ndims); | |
| 365 | |
| 366 void[] foo(TypeInfo ti, size_t* pdim, int ndims) | |
| 367 { | |
| 368 size_t dim = *pdim; | |
| 369 void[] p; | |
| 370 | |
| 371 if (ndims == 1) | |
| 372 { | |
| 373 auto r = _d_newarrayiT(ti, dim); | |
| 374 p = *cast(void[]*)(&r); | |
| 375 } | |
| 376 else | |
| 377 { | |
| 378 p = gc_malloc(dim * (void[]).sizeof + 1)[0 .. dim]; | |
| 379 for (int i = 0; i < dim; i++) | |
| 380 { | |
| 381 (cast(void[]*)p.ptr)[i] = foo(ti.next, pdim + 1, ndims - 1); | |
| 382 } | |
| 383 } | |
| 384 return p; | |
| 385 } | |
| 386 | |
| 387 size_t* pdim = cast(size_t *)q; | |
| 388 result = cast(ulong)foo(ti, pdim, ndims); | |
| 389 debug(PRINTF) printf("result = %llx\n", result); | |
| 390 | |
| 391 version (none) | |
| 392 { | |
| 393 for (int i = 0; i < ndims; i++) | |
| 394 { | |
| 395 printf("index %d: %d\n", i, va_arg!(int)(q)); | |
| 396 printf("init = %d\n", va_arg!(int)(q)); | |
| 397 } | |
| 398 } | |
| 399 va_end(q); | |
| 400 } | |
| 401 return result; | |
| 402 } | |
| 403 | |
| 404 /** | |
| 405 * | |
| 406 */ | |
| 407 void* _d_allocmemory(size_t nbytes) | |
| 408 { | |
| 409 return gc_malloc(nbytes); | |
| 410 } | |
| 411 | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
412 +/ |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
413 |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
414 /** |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
415 * for allocating a single POD value |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
416 */ |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
417 extern (C) void* _d_allocmemoryT(TypeInfo ti) |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
418 { |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
419 return gc_malloc(ti.tsize(), (ti.flags() & 1) ? BlkAttr.NO_SCAN : 0); |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
420 } |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
421 |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
422 /** |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
423 * |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
424 */ |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
425 extern (C) void _d_delarray(size_t plength, void* pdata) |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
426 { |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
427 // if (p) |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
428 // { |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
429 assert(!plength || pdata); |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
430 |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
431 if (pdata) |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
432 gc_free(pdata); |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
433 // p.data = null; |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
434 // p.length = 0; |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
435 // } |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
436 } |
| 132 | 437 |
| 438 /** | |
| 439 * | |
| 440 */ | |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
441 extern (C) void _d_delmemory(void* p) |
| 132 | 442 { |
| 443 if (p) | |
| 444 { | |
|
209
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
445 gc_free(p); |
|
c4c9b4ac021b
[svn r225] Fixed: delete expressions no longer use llvm's free instruction, which crashes on a GC provided pointer.
lindquist
parents:
203
diff
changeset
|
446 //*p = null; |
| 132 | 447 } |
| 448 } | |
| 449 | |
| 450 | |
| 451 /** | |
| 452 * | |
| 453 */ | |
| 454 extern (C) void _d_callfinalizer(void* p) | |
| 455 { | |
| 456 rt_finalize( p ); | |
| 457 } | |
| 458 | |
| 459 | |
| 460 /** | |
| 461 * | |
| 462 */ | |
| 463 extern (C) void rt_finalize(void* p, bool det = true) | |
| 464 { | |
| 465 debug(PRINTF) printf("rt_finalize(p = %p)\n", p); | |
| 466 | |
| 467 if (p) // not necessary if called from gc | |
| 468 { | |
| 469 ClassInfo** pc = cast(ClassInfo**)p; | |
| 470 | |
| 471 if (*pc) | |
| 472 { | |
| 473 ClassInfo c = **pc; | |
| 474 | |
| 475 try | |
| 476 { | |
| 477 if (det || onCollectResource(cast(Object)p)) | |
| 478 { | |
| 479 do | |
| 480 { | |
| 481 if (c.destructor) | |
| 482 { | |
| 483 fp_t fp = cast(fp_t)c.destructor; | |
| 484 (*fp)(cast(Object)p); // call destructor | |
| 485 } | |
| 486 c = c.base; | |
| 487 } while (c); | |
| 488 } | |
| 489 if ((cast(void**)p)[1]) // if monitor is not null | |
| 490 _d_monitordelete(cast(Object)p, det); | |
| 491 } | |
| 492 catch (Exception e) | |
| 493 { | |
| 494 onFinalizeError(**pc, e); | |
| 495 } | |
| 496 finally | |
| 497 { | |
| 498 *pc = null; // zero vptr | |
| 499 } | |
| 500 } | |
| 501 } | |
| 502 } | |
| 503 | |
| 504 /** | |
| 505 * Resize dynamic arrays with 0 initializers. | |
| 506 */ | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
507 extern (C) byte* _d_arraysetlengthT(TypeInfo ti, size_t newlength, size_t plength, byte* pdata) |
| 132 | 508 in |
| 509 { | |
| 510 assert(ti); | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
511 assert(!plength || pdata); |
| 132 | 512 } |
| 513 body | |
| 514 { | |
| 515 byte* newdata; | |
| 516 size_t sizeelem = ti.next.tsize(); | |
| 517 | |
| 518 debug(PRINTF) | |
| 519 { | |
|
211
f66219e0d530
[svn r227] Fixed: crash in lifetime.d when resizing array of AAs by .length assignment.
lindquist
parents:
209
diff
changeset
|
520 printf("_d_arraysetlengthT(sizeelem = %d, newlength = %d)\n", sizeelem, newlength); |
|
f66219e0d530
[svn r227] Fixed: crash in lifetime.d when resizing array of AAs by .length assignment.
lindquist
parents:
209
diff
changeset
|
521 printf("\tp.data = %p, p.length = %d\n", pdata, plength); |
| 132 | 522 } |
| 523 | |
| 524 if (newlength) | |
| 525 { | |
|
237
a168a2c3ea48
[svn r253] Removed -inlineasm option. inline asm is now enabled by default unless the new -noasm option is passed.
lindquist
parents:
212
diff
changeset
|
526 version (Asm86) |
| 132 | 527 { |
| 528 size_t newsize = void; | |
| 529 | |
| 530 asm | |
| 531 { | |
| 532 mov EAX, newlength; | |
| 533 mul EAX, sizeelem; | |
| 534 mov newsize, EAX; | |
| 535 jc Loverflow; | |
| 536 } | |
| 537 } | |
| 538 else | |
| 539 { | |
| 540 size_t newsize = sizeelem * newlength; | |
| 541 | |
| 542 if (newsize / newlength != sizeelem) | |
| 543 goto Loverflow; | |
| 544 } | |
| 545 | |
| 546 debug(PRINTF) printf("newsize = %x, newlength = %x\n", newsize, newlength); | |
| 547 | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
548 if (pdata) |
| 132 | 549 { |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
550 newdata = pdata; |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
551 if (newlength > plength) |
| 132 | 552 { |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
553 size_t size = plength * sizeelem; |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
554 auto info = gc_query(pdata); |
| 132 | 555 |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
556 if (info.size <= newsize || info.base != pdata) |
| 132 | 557 { |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
558 if (info.size >= PAGESIZE && info.base == pdata) |
| 132 | 559 { // Try to extend in-place |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
560 auto u = gc_extend(pdata, (newsize + 1) - info.size, (newsize + 1) - info.size); |
| 132 | 561 if (u) |
| 562 { | |
| 563 goto L1; | |
| 564 } | |
| 565 } | |
| 566 newdata = cast(byte *)gc_malloc(newsize + 1, info.attr); | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
567 newdata[0 .. size] = pdata[0 .. size]; |
| 132 | 568 } |
| 569 L1: | |
| 570 newdata[size .. newsize] = 0; | |
| 571 } | |
| 572 } | |
| 573 else | |
| 574 { | |
| 575 newdata = cast(byte *)gc_calloc(newsize + 1, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0); | |
| 576 } | |
| 577 } | |
| 578 else | |
| 579 { | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
580 newdata = pdata; |
| 132 | 581 } |
| 582 | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
583 return newdata; |
| 132 | 584 |
| 585 Loverflow: | |
| 586 onOutOfMemoryError(); | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
587 return null; |
| 132 | 588 } |
| 589 | |
| 590 | |
| 591 /** | |
| 592 * Resize arrays for non-zero initializers. | |
| 593 * p pointer to array lvalue to be updated | |
| 594 * newlength new .length property of array | |
| 595 * sizeelem size of each element of array | |
| 596 * initsize size of initializer | |
| 597 * ... initializer | |
| 598 */ | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
599 extern (C) byte* _d_arraysetlengthiT(TypeInfo ti, size_t newlength, size_t plength, byte* pdata) |
| 132 | 600 in |
| 601 { | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
602 assert(!plength || pdata); |
| 132 | 603 } |
| 604 body | |
| 605 { | |
| 606 byte* newdata; | |
|
211
f66219e0d530
[svn r227] Fixed: crash in lifetime.d when resizing array of AAs by .length assignment.
lindquist
parents:
209
diff
changeset
|
607 TypeInfo tinext = ti.next; |
|
f66219e0d530
[svn r227] Fixed: crash in lifetime.d when resizing array of AAs by .length assignment.
lindquist
parents:
209
diff
changeset
|
608 size_t sizeelem = tinext.tsize(); |
|
f66219e0d530
[svn r227] Fixed: crash in lifetime.d when resizing array of AAs by .length assignment.
lindquist
parents:
209
diff
changeset
|
609 void[] initializer = tinext.init(); |
| 132 | 610 size_t initsize = initializer.length; |
| 611 | |
| 612 assert(sizeelem); | |
| 613 assert(initsize); | |
| 614 assert(initsize <= sizeelem); | |
| 615 assert((sizeelem / initsize) * initsize == sizeelem); | |
| 616 | |
| 617 debug(PRINTF) | |
| 618 { | |
|
211
f66219e0d530
[svn r227] Fixed: crash in lifetime.d when resizing array of AAs by .length assignment.
lindquist
parents:
209
diff
changeset
|
619 printf("_d_arraysetlengthiT(sizeelem = %d, newlength = %d, initsize = %d)\n", sizeelem, newlength, initsize); |
|
f66219e0d530
[svn r227] Fixed: crash in lifetime.d when resizing array of AAs by .length assignment.
lindquist
parents:
209
diff
changeset
|
620 printf("\tp.data = %p, p.length = %d\n", pdata, plength); |
| 132 | 621 } |
| 622 | |
| 623 if (newlength) | |
| 624 { | |
|
237
a168a2c3ea48
[svn r253] Removed -inlineasm option. inline asm is now enabled by default unless the new -noasm option is passed.
lindquist
parents:
212
diff
changeset
|
625 version (Asm86) |
| 132 | 626 { |
| 627 size_t newsize = void; | |
| 628 | |
| 629 asm | |
| 630 { | |
| 631 mov EAX,newlength ; | |
| 632 mul EAX,sizeelem ; | |
| 633 mov newsize,EAX ; | |
| 634 jc Loverflow ; | |
| 635 } | |
| 636 } | |
| 637 else | |
| 638 { | |
| 639 size_t newsize = sizeelem * newlength; | |
| 640 | |
| 641 if (newsize / newlength != sizeelem) | |
| 642 goto Loverflow; | |
| 643 } | |
| 644 debug(PRINTF) printf("newsize = %x, newlength = %x\n", newsize, newlength); | |
| 645 | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
646 size_t size = plength * sizeelem; |
| 132 | 647 |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
648 if (pdata) |
| 132 | 649 { |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
650 newdata = pdata; |
|
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
651 if (newlength > plength) |
| 132 | 652 { |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
653 auto info = gc_query(pdata); |
| 132 | 654 |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
655 if (info.size <= newsize || info.base != pdata) |
| 132 | 656 { |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
657 if (info.size >= PAGESIZE && info.base == pdata) |
| 132 | 658 { // Try to extend in-place |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
659 auto u = gc_extend(pdata, (newsize + 1) - info.size, (newsize + 1) - info.size); |
| 132 | 660 if (u) |
| 661 { | |
| 662 goto L1; | |
| 663 } | |
| 664 } | |
| 665 newdata = cast(byte *)gc_malloc(newsize + 1, info.attr); | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
666 newdata[0 .. size] = pdata[0 .. size]; |
| 132 | 667 L1: ; |
| 668 } | |
| 669 } | |
| 670 } | |
| 671 else | |
| 672 { | |
|
211
f66219e0d530
[svn r227] Fixed: crash in lifetime.d when resizing array of AAs by .length assignment.
lindquist
parents:
209
diff
changeset
|
673 newdata = cast(byte *)gc_malloc(newsize + 1, !(tinext.flags() & 1) ? BlkAttr.NO_SCAN : 0); |
| 132 | 674 } |
| 675 | |
| 676 auto q = initializer.ptr; // pointer to initializer | |
| 677 | |
| 678 if (newsize > size) | |
| 679 { | |
| 680 if (initsize == 1) | |
| 681 { | |
| 682 debug(PRINTF) printf("newdata = %p, size = %d, newsize = %d, *q = %d\n", newdata, size, newsize, *cast(byte*)q); | |
| 683 newdata[size .. newsize] = *(cast(byte*)q); | |
| 684 } | |
| 685 else | |
| 686 { | |
| 687 for (size_t u = size; u < newsize; u += initsize) | |
| 688 { | |
| 689 memcpy(newdata + u, q, initsize); | |
| 690 } | |
| 691 } | |
| 692 } | |
| 693 } | |
| 694 else | |
| 695 { | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
696 newdata = pdata; |
| 132 | 697 } |
| 698 | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
699 return newdata; |
| 132 | 700 |
| 701 Loverflow: | |
| 702 onOutOfMemoryError(); | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
703 return null; |
| 132 | 704 } |
| 705 | |
|
203
e881c9b1c738
[svn r219] Fixed: the tango/lib/gc/basic garbage collector now compiles and links into an executable (change in tango/lib/llvmdc-posix.mak), closes #5 .
lindquist
parents:
137
diff
changeset
|
706 /+ |
| 132 | 707 |
| 708 /** | |
| 709 * Append y[] to array x[]. | |
| 710 * size is size of each array element. | |
| 711 */ | |
| 712 extern (C) long _d_arrayappendT(TypeInfo ti, Array *px, byte[] y) | |
| 713 { | |
| 714 auto sizeelem = ti.next.tsize(); // array element size | |
| 715 auto info = gc_query(px.data); | |
| 716 auto length = px.length; | |
| 717 auto newlength = length + y.length; | |
| 718 auto newsize = newlength * sizeelem; | |
| 719 | |
| 720 if (info.size < newsize || info.base != px.data) | |
| 721 { byte* newdata; | |
| 722 | |
| 723 if (info.size >= PAGESIZE && info.base == px.data) | |
| 724 { // Try to extend in-place | |
| 725 auto u = gc_extend(px.data, (newsize + 1) - info.size, (newsize + 1) - info.size); | |
| 726 if (u) | |
| 727 { | |
| 728 goto L1; | |
| 729 } | |
| 730 } | |
| 731 newdata = cast(byte *)gc_malloc(newCapacity(newlength, sizeelem) + 1, info.attr); | |
| 732 memcpy(newdata, px.data, length * sizeelem); | |
| 733 px.data = newdata; | |
| 734 } | |
| 735 L1: | |
| 736 px.length = newlength; | |
| 737 memcpy(px.data + length * sizeelem, y.ptr, y.length * sizeelem); | |
| 738 return *cast(long*)px; | |
| 739 } | |
| 740 | |
| 741 | |
| 742 /** | |
| 743 * | |
| 744 */ | |
| 745 size_t newCapacity(size_t newlength, size_t size) | |
| 746 { | |
| 747 version(none) | |
| 748 { | |
| 749 size_t newcap = newlength * size; | |
| 750 } | |
| 751 else | |
| 752 { | |
| 753 /* | |
| 754 * Better version by Dave Fladebo: | |
| 755 * This uses an inverse logorithmic algorithm to pre-allocate a bit more | |
| 756 * space for larger arrays. | |
| 757 * - Arrays smaller than PAGESIZE bytes are left as-is, so for the most | |
| 758 * common cases, memory allocation is 1 to 1. The small overhead added | |
| 759 * doesn't affect small array perf. (it's virtually the same as | |
| 760 * current). | |
| 761 * - Larger arrays have some space pre-allocated. | |
| 762 * - As the arrays grow, the relative pre-allocated space shrinks. | |
| 763 * - The logorithmic algorithm allocates relatively more space for | |
| 764 * mid-size arrays, making it very fast for medium arrays (for | |
| 765 * mid-to-large arrays, this turns out to be quite a bit faster than the | |
| 766 * equivalent realloc() code in C, on Linux at least. Small arrays are | |
| 767 * just as fast as GCC). | |
| 768 * - Perhaps most importantly, overall memory usage and stress on the GC | |
| 769 * is decreased significantly for demanding environments. | |
| 770 */ | |
| 771 size_t newcap = newlength * size; | |
| 772 size_t newext = 0; | |
| 773 | |
| 774 if (newcap > PAGESIZE) | |
| 775 { | |
| 776 //double mult2 = 1.0 + (size / log10(pow(newcap * 2.0,2.0))); | |
| 777 | |
| 778 // redo above line using only integer math | |
| 779 | |
| 780 static int log2plus1(size_t c) | |
| 781 { int i; | |
| 782 | |
| 783 if (c == 0) | |
| 784 i = -1; | |
| 785 else | |
| 786 for (i = 1; c >>= 1; i++) | |
| 787 { | |
| 788 } | |
| 789 return i; | |
| 790 } | |
| 791 | |
| 792 /* The following setting for mult sets how much bigger | |
| 793 * the new size will be over what is actually needed. | |
| 794 * 100 means the same size, more means proportionally more. | |
| 795 * More means faster but more memory consumption. | |
| 796 */ | |
| 797 //long mult = 100 + (1000L * size) / (6 * log2plus1(newcap)); | |
| 798 long mult = 100 + (1000L * size) / log2plus1(newcap); | |
| 799 | |
| 800 // testing shows 1.02 for large arrays is about the point of diminishing return | |
| 801 if (mult < 102) | |
| 802 mult = 102; | |
| 803 newext = cast(size_t)((newcap * mult) / 100); | |
| 804 newext -= newext % size; | |
| 805 debug(PRINTF) printf("mult: %2.2f, alloc: %2.2f\n",mult/100.0,newext / cast(double)size); | |
| 806 } | |
| 807 newcap = newext > newcap ? newext : newcap; | |
| 808 debug(PRINTF) printf("newcap = %d, newlength = %d, size = %d\n", newcap, newlength, size); | |
| 809 } | |
| 810 return newcap; | |
| 811 } | |
| 812 | |
| 813 | |
| 814 /** | |
| 815 * | |
| 816 */ | |
| 817 extern (C) byte[] _d_arrayappendcT(TypeInfo ti, inout byte[] x, ...) | |
| 818 { | |
| 819 auto sizeelem = ti.next.tsize(); // array element size | |
| 820 auto info = gc_query(x.ptr); | |
| 821 auto length = x.length; | |
| 822 auto newlength = length + 1; | |
| 823 auto newsize = newlength * sizeelem; | |
| 824 | |
| 825 assert(info.size == 0 || length * sizeelem <= info.size); | |
| 826 | |
| 827 debug(PRINTF) printf("_d_arrayappendcT(sizeelem = %d, ptr = %p, length = %d, cap = %d)\n", sizeelem, x.ptr, x.length, info.size); | |
| 828 | |
| 829 if (info.size <= newsize || info.base != x.ptr) | |
| 830 { byte* newdata; | |
| 831 | |
| 832 if (info.size >= PAGESIZE && info.base == x.ptr) | |
| 833 { // Try to extend in-place | |
| 834 auto u = gc_extend(x.ptr, (newsize + 1) - info.size, (newsize + 1) - info.size); | |
| 835 if (u) | |
| 836 { | |
| 837 goto L1; | |
| 838 } | |
| 839 } | |
| 840 debug(PRINTF) printf("_d_arrayappendcT(length = %d, newlength = %d, cap = %d)\n", length, newlength, info.size); | |
| 841 auto newcap = newCapacity(newlength, sizeelem); | |
| 842 assert(newcap >= newlength * sizeelem); | |
| 843 newdata = cast(byte *)gc_malloc(newcap + 1, info.attr); | |
| 844 memcpy(newdata, x.ptr, length * sizeelem); | |
| 845 (cast(void**)(&x))[1] = newdata; | |
| 846 } | |
| 847 L1: | |
| 848 byte *argp = cast(byte *)(&ti + 2); | |
| 849 | |
| 850 *cast(size_t *)&x = newlength; | |
| 851 x.ptr[length * sizeelem .. newsize] = argp[0 .. sizeelem]; | |
| 852 assert((cast(size_t)x.ptr & 15) == 0); | |
| 853 assert(gc_sizeOf(x.ptr) > x.length * sizeelem); | |
| 854 return x; | |
| 855 } | |
| 856 | |
| 857 | |
| 858 /** | |
| 859 * | |
| 860 */ | |
| 861 extern (C) byte[] _d_arraycatT(TypeInfo ti, byte[] x, byte[] y) | |
| 862 out (result) | |
| 863 { | |
| 864 auto sizeelem = ti.next.tsize(); // array element size | |
| 865 debug(PRINTF) printf("_d_arraycatT(%d,%p ~ %d,%p sizeelem = %d => %d,%p)\n", x.length, x.ptr, y.length, y.ptr, sizeelem, result.length, result.ptr); | |
| 866 assert(result.length == x.length + y.length); | |
| 867 for (size_t i = 0; i < x.length * sizeelem; i++) | |
| 868 assert((cast(byte*)result)[i] == (cast(byte*)x)[i]); | |
| 869 for (size_t i = 0; i < y.length * sizeelem; i++) | |
| 870 assert((cast(byte*)result)[x.length * sizeelem + i] == (cast(byte*)y)[i]); | |
| 871 | |
| 872 size_t cap = gc_sizeOf(result.ptr); | |
| 873 assert(!cap || cap > result.length * sizeelem); | |
| 874 } | |
| 875 body | |
| 876 { | |
| 877 version (none) | |
| 878 { | |
| 879 /* Cannot use this optimization because: | |
| 880 * char[] a, b; | |
| 881 * char c = 'a'; | |
| 882 * b = a ~ c; | |
| 883 * c = 'b'; | |
| 884 * will change the contents of b. | |
| 885 */ | |
| 886 if (!y.length) | |
| 887 return x; | |
| 888 if (!x.length) | |
| 889 return y; | |
| 890 } | |
| 891 | |
| 892 debug(PRINTF) printf("_d_arraycatT(%d,%p ~ %d,%p)\n", x.length, x.ptr, y.length, y.ptr); | |
| 893 auto sizeelem = ti.next.tsize(); // array element size | |
| 894 debug(PRINTF) printf("_d_arraycatT(%d,%p ~ %d,%p sizeelem = %d)\n", x.length, x.ptr, y.length, y.ptr, sizeelem); | |
| 895 size_t xlen = x.length * sizeelem; | |
| 896 size_t ylen = y.length * sizeelem; | |
| 897 size_t len = xlen + ylen; | |
| 898 | |
| 899 if (!len) | |
| 900 return null; | |
| 901 | |
| 902 byte* p = cast(byte*)gc_malloc(len + 1, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0); | |
| 903 memcpy(p, x.ptr, xlen); | |
| 904 memcpy(p + xlen, y.ptr, ylen); | |
| 905 p[len] = 0; | |
| 906 return p[0 .. x.length + y.length]; | |
| 907 } | |
| 908 | |
| 909 | |
| 910 /** | |
| 911 * | |
| 912 */ | |
| 913 extern (C) byte[] _d_arraycatnT(TypeInfo ti, uint n, ...) | |
| 914 { void* a; | |
| 915 size_t length; | |
| 916 byte[]* p; | |
| 917 uint i; | |
| 918 byte[] b; | |
| 919 auto size = ti.next.tsize(); // array element size | |
| 920 | |
| 921 p = cast(byte[]*)(&n + 1); | |
| 922 | |
| 923 for (i = 0; i < n; i++) | |
| 924 { | |
| 925 b = *p++; | |
| 926 length += b.length; | |
| 927 } | |
| 928 if (!length) | |
| 929 return null; | |
| 930 | |
| 931 a = gc_malloc(length * size, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0); | |
| 932 p = cast(byte[]*)(&n + 1); | |
| 933 | |
| 934 uint j = 0; | |
| 935 for (i = 0; i < n; i++) | |
| 936 { | |
| 937 b = *p++; | |
| 938 if (b.length) | |
| 939 { | |
| 940 memcpy(a + j, b.ptr, b.length * size); | |
| 941 j += b.length * size; | |
| 942 } | |
| 943 } | |
| 944 | |
| 945 byte[] result; | |
| 946 *cast(int *)&result = length; // jam length | |
| 947 (cast(void **)&result)[1] = a; // jam ptr | |
| 948 return result; | |
| 949 } | |
| 950 | |
| 951 | |
| 952 /** | |
| 953 * | |
| 954 */ | |
| 955 extern (C) void* _d_arrayliteralT(TypeInfo ti, size_t length, ...) | |
| 956 { | |
| 957 auto sizeelem = ti.next.tsize(); // array element size | |
| 958 void* result; | |
| 959 | |
| 960 debug(PRINTF) printf("_d_arrayliteralT(sizeelem = %d, length = %d)\n", sizeelem, length); | |
| 961 if (length == 0 || sizeelem == 0) | |
| 962 result = null; | |
| 963 else | |
| 964 { | |
| 965 result = gc_malloc(length * sizeelem, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0); | |
| 966 | |
| 967 va_list q; | |
| 968 va_start!(size_t)(q, length); | |
| 969 | |
| 970 size_t stacksize = (sizeelem + int.sizeof - 1) & ~(int.sizeof - 1); | |
| 971 | |
| 972 if (stacksize == sizeelem) | |
| 973 { | |
| 974 memcpy(result, q, length * sizeelem); | |
| 975 } | |
| 976 else | |
| 977 { | |
| 978 for (size_t i = 0; i < length; i++) | |
| 979 { | |
| 980 memcpy(result + i * sizeelem, q, sizeelem); | |
| 981 q += stacksize; | |
| 982 } | |
| 983 } | |
| 984 | |
| 985 va_end(q); | |
| 986 } | |
| 987 return result; | |
| 988 } | |
| 989 | |
| 990 +/ | |
| 991 | |
| 992 | |
| 993 /** | |
| 994 * Support for array.dup property. | |
| 995 */ | |
| 996 struct Array2 | |
| 997 { | |
| 998 size_t length; | |
| 999 void* ptr; | |
| 1000 } | |
| 1001 | |
| 1002 | |
| 1003 /** | |
| 1004 * | |
| 1005 */ | |
| 1006 extern (C) Array2 _adDupT(TypeInfo ti, Array2 a) | |
| 1007 out (result) | |
| 1008 { | |
| 1009 auto sizeelem = ti.next.tsize(); // array element size | |
| 1010 assert(memcmp(result.ptr, a.ptr, a.length * sizeelem) == 0); | |
| 1011 } | |
| 1012 body | |
| 1013 { | |
| 1014 Array2 r; | |
| 1015 | |
| 1016 if (a.length) | |
| 1017 { | |
| 1018 auto sizeelem = ti.next.tsize(); // array element size | |
| 1019 auto size = a.length * sizeelem; | |
| 1020 r.ptr = gc_malloc(size, !(ti.next.flags() & 1) ? BlkAttr.NO_SCAN : 0); | |
| 1021 r.length = a.length; | |
| 1022 memcpy(r.ptr, a.ptr, size); | |
| 1023 } | |
| 1024 return r; | |
| 1025 } | |
| 1026 | |
| 1027 | |
| 1028 unittest | |
| 1029 { | |
| 1030 int[] a; | |
| 1031 int[] b; | |
| 1032 int i; | |
| 1033 | |
| 1034 a = new int[3]; | |
| 1035 a[0] = 1; a[1] = 2; a[2] = 3; | |
| 1036 b = a.dup; | |
| 1037 assert(b.length == 3); | |
| 1038 for (i = 0; i < 3; i++) | |
| 1039 assert(b[i] == i + 1); | |
| 1040 } |