projects/ldc: lphobos/gc/gc.d annotate

annotate lphobos/gc/gc.d @ 1650:40bd4a0d4870

Update to work with LLVM 2.7. Removed use of dyn_cast, llvm no compiles without exceptions and rtti by default. We do need exceptions for the libconfig stuff, but rtti isn't necessary (anymore). Debug info needs to be rewritten, as in LLVM 2.7 the format has completely changed. To have something to look at while rewriting, the old code has been wrapped inside #ifndef DISABLE_DEBUG_INFO , this means that you have to define this to compile at the moment. Updated tango 0.99.9 patch to include updated EH runtime code, which is needed for LLVM 2.7 as well.

author	Tomas Lindquist Olsen
date	Wed, 19 May 2010 12:42:32 +0200
parents	88e23f8c2354
children

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

Mercurial > projects > ldc

annotate lphobos/gc/gc.d @ 1650:40bd4a0d4870