projects/ldc: gen/structs.cpp annotate

annotate gen/structs.cpp @ 797:340acf1535d0

Removed KDevelop3 project files, CMake can generate them just fine! Fixed function literals in static initializers. Changed alignment of delegates from 2*PTRSIZE to just PTRSIZE. Changed errors to go to stderr instead of stdout. Fairly major rewriting of struct/union/class handling, STILL A BIT BUGGY !!!

author	Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date	Sat, 29 Nov 2008 21:25:43 +0100
parents	6e7a4c3b64d2
children	d14e4594c7d7

rev	line source
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	1 #include <algorithm>
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	2
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	3 #include "gen/llvm.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	4
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	5 #include "mtype.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	6 #include "aggregate.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	7 #include "init.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	8 #include "declaration.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	9
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	10 #include "gen/irstate.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	11 #include "gen/tollvm.h"
244 a95056b3c996 [svn r261] Fixed debug info for integer and floating local variables, can now be inspected in GDB. lindquist parents: 217 diff changeset	12 #include "gen/llvmhelpers.h"
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	13 #include "gen/arrays.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	14 #include "gen/logger.h"
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	15 #include "gen/structs.h"
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	16 #include "gen/dvalue.h"
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	17
136 0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	18 #include "ir/irstruct.h"
0e28624814e8 [svn r140] did a lot of the work towards being able to pass multiple modules on the command line. not complete yet though lindquist parents: 133 diff changeset	19
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	20 //////////////////////////////////////////////////////////////////////////////////////////
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	21 void addZeros(std::vector<llvm::Constant*>& inits, unsigned pos, unsigned offset); // defined in irstruct.cpp
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	22
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	23 // pair of var and its init
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	24 typedef std::pair<VarDeclaration,Initializer> VarInitPair;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	25
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	26 // comparison func for qsort
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	27 static int varinit_offset_cmp_func(const void* p1, const void* p2)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	28 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	29 VarDeclaration* v1 = ((VarInitPair*)p1)->first;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	30 VarDeclaration* v2 = ((VarInitPair*)p2)->first;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	31 if (v1->offset < v2->offset)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	32 return -1;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	33 else if (v1->offset > v2->offset)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	34 return 1;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	35 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	36 return 0;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	37 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	38
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	39 /*
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	40 this uses a simple algorithm to build the correct constant
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	41
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	42 (1) first sort the explicit initializers by offset... well, DMD doesn't :)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	43
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	44 (2) if there is NO space before the next explicit initializeer, goto (9)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	45 (3) find the next default initializer that fits before it, if NOT found goto (7)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	46 (4) insert zero padding up to the next default initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	47 (5) insert the next default initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	48 (6) goto (2)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	49
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	50 (7) insert zero padding up to the next explicit initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	51
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	52 (9) insert the next explicit initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	53 (10) goto (2)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	54
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	55 (11) done
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	56
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	57 (next can be the end too)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	58
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	59 */
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	60
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	61 // return the next default initializer to use or null
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	62 static VarDeclaration* nextDefault(IrStruct* irstruct, size_t& idx, size_t pos, size_t offset)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	63 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	64 IrStruct::VarDeclVector& defaults = irstruct->defVars;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	65 size_t ndefaults = defaults.size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	66
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	67 // for each valid index
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	68 while(idx < ndefaults)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	69 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	70 VarDeclaration* v = defaults[idx];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	71
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	72 // skip defaults before pos
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	73 if (v->offset < pos)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	74 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	75 idx++;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	76 continue;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	77 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	78
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	79 // this var default fits
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	80 if (v->offset >= pos && v->offset + v->type->size() <= offset)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	81 return v;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	82
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	83 // not usable
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	84 break;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	85 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	86
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	87 // not usable
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	88 return NULL;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	89 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	90
213 7816aafeea3c [svn r229] Updated the object.d implementation to the latest Tango. lindquist parents: 205 diff changeset	91 LLConstant* DtoConstStructInitializer(StructInitializer* si)
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	92 {
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	93 Logger::println("DtoConstStructInitializer: %s", si->toChars());
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	94 LOG_SCOPE;
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	95
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	96 // get TypeStruct
449 56265fa07c7d Fixed problem where global variables did not resolve type before using it. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 443 diff changeset	97 assert(si->ad);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	98 TypeStruct* ts = (TypeStruct*)si->ad->type;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	99
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	100 // force constant initialization of the symbol
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	101 DtoForceConstInitDsymbol(si->ad);
449 56265fa07c7d Fixed problem where global variables did not resolve type before using it. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 443 diff changeset	102
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	103 // get formal type
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	104 const llvm::StructType* structtype = isaStruct(ts->ir.type->get());
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 585 diff changeset	105
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	106 // log it
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 585 diff changeset	107 if (Logger::enabled())
26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 585 diff changeset	108 Logger::cout() << "llvm struct type: " << *structtype << '\n';
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	109
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	110 // sanity check
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	111 assert(si->value.dim > 0);
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	112 assert(si->value.dim == si->vars.dim);
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	113
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	114 // vector of final initializer constants
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	115 std::vector<LLConstant*> inits;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	116
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	117 // get the ir struct
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	118 IrStruct* irstruct = si->ad->ir.irStruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	119
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	120 // get default fields
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	121 IrStruct::VarDeclVector& defaults = irstruct->defVars;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	122 size_t ndefaults = defaults.size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	123
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	124 // make sure si->vars is sorted by offset
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	125 std::vector<VarInitPair> vars;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	126 size_t nvars = si->vars.dim;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	127 vars.resize(nvars);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	128
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	129 // fill pair vector
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	130 for (size_t i = 0; i < nvars; i++)
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	131 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	132 VarDeclaration* var = (VarDeclaration*)si->vars.data[i];
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	133 Initializer* ini = (Initializer*)si->value.data[i];
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	134 assert(var);
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	135 assert(ini);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	136 vars[i] = std::make_pair(var, ini);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	137 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	138 // sort it
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	139 qsort(&vars[0], nvars, sizeof(VarInitPair), &varinit_offset_cmp_func);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	140
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	141 // check integrity
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	142 // and do error checking, since the frontend does verify static struct initializers
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	143 size_t lastoffset = 0;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	144 size_t lastsize = 0;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	145 bool overlap = false;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	146 for (size_t i=0; i < nvars; i++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	147 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	148 // next explicit init var
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	149 VarDeclaration* var = vars[i].first;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	150 Logger::println("var = %s : +%u", var->toChars(), var->offset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	151
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	152 // I would have thought this to be a frontend check
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	153 for (size_t j=i+1; j<nvars; j++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	154 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	155 if (j == i)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	156 continue;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	157 VarDeclaration* var2 = vars[j].first;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	158 if (var2->offset >= var->offset && var2->offset < var->offset + var->type->size())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	159 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	160 fprintf(stdmsg, "Error: %s: initializer '%s' overlaps with '%s'\n", si->loc.toChars(), var->toChars(), var2->toChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	161 overlap = true;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	162 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	163 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	164
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	165 // update offsets
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	166 lastoffset = var->offset;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	167 lastsize = var->type->size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	168 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	169
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	170 // error handling, report all overlaps before aborting
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	171 if (overlap)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	172 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	173 error("%s: overlapping union initializers", si->loc.toChars());
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	174 }
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	175
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	176 // go through each explicit initalizer, falling back to defaults or zeros when necessary
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	177 lastoffset = 0;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	178 lastsize = 0;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	179
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	180 size_t j=0; // defaults
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	181
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	182 for (size_t i=0; i < nvars; i++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	183 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	184 // get var and init
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	185 VarDeclaration* var = vars[i].first;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	186 Initializer* ini = vars[i].second;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	187
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	188 size_t offset = var->offset;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	189 size_t size = var->type->size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	190
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	191 // if there is space before the next explicit initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	192 Lpadding:
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	193 size_t pos = lastoffset+lastsize;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	194 if (offset > pos)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	195 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	196 // find the the next default initializer that fits in this space
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	197 VarDeclaration* nextdef = nextDefault(irstruct, j, lastoffset+lastsize, offset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	198
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	199 // found
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	200 if (nextdef)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	201 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	202 // need zeros before the default
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	203 if (nextdef->offset > pos)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	204 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	205 Logger::println("inserting %lu byte padding at %lu", nextdef->offset - pos, pos);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	206 addZeros(inits, pos, nextdef->offset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	207 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	208
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	209 // do the default
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	210 Logger::println("adding default field: %s : +%u", nextdef->toChars(), nextdef->offset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	211 LLConstant* c = nextdef->ir.irField->constInit;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	212 inits.push_back(c);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	213
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	214 // update offsets
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	215 lastoffset = nextdef->offset;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	216 lastsize = nextdef->type->size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	217
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	218 // check if more defaults would fit
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	219 goto Lpadding;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	220 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	221 // not found, pad with zeros
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	222 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	223 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	224 Logger::println("inserting %lu byte padding at %lu", offset - pos, pos);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	225 addZeros(inits, pos, offset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	226 // offsets are updated by the explicit initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	227 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	228 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	229
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	230 // insert next explicit
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	231 Logger::println("adding explicit field: %s : +%lu", var->toChars(), offset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	232 LOG_SCOPE;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	233 LLConstant* c = DtoConstInitializer(var->loc, var->type, ini);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	234 inits.push_back(c);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	235
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	236 lastoffset = offset;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	237 lastsize = size;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	238 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	239
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	240 // there might still be padding after the last one, make sure that is defaulted/zeroed as well
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	241 size_t structsize = getABITypeSize(structtype);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	242
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	243 // if there is space before the next explicit initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	244 // FIXME: this should be handled in the loop above as well
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	245 Lpadding2:
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	246 size_t pos = lastoffset+lastsize;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	247 if (structsize > pos)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	248 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	249 // find the the next default initializer that fits in this space
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	250 VarDeclaration* nextdef = nextDefault(irstruct, j, lastoffset+lastsize, structsize);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	251
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	252 // found
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	253 if (nextdef)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	254 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	255 // need zeros before the default
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	256 if (nextdef->offset > pos)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	257 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	258 Logger::println("inserting %lu byte padding at %lu", nextdef->offset - pos, pos);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	259 addZeros(inits, pos, nextdef->offset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	260 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	261
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	262 // do the default
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	263 Logger::println("adding default field: %s : +%u", nextdef->toChars(), nextdef->offset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	264 LLConstant* c = nextdef->ir.irField->constInit;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	265 inits.push_back(c);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	266
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	267 // update offsets
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	268 lastoffset = nextdef->offset;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	269 lastsize = nextdef->type->size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	270
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	271 // check if more defaults would fit
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	272 goto Lpadding2;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	273 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	274 // not found, pad with zeros
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	275 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	276 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	277 Logger::println("inserting %lu byte padding at %lu", structsize - pos, pos);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	278 addZeros(inits, pos, structsize);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	279 lastoffset = pos;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	280 lastsize = structsize - pos;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	281 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	282 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	283
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	284 assert(lastoffset+lastsize == structsize);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	285
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	286 // make the constant struct
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	287 LLConstant* c = LLConstantStruct::get(inits, si->ad->ir.irStruct->packed);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	288 if (Logger::enabled())
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	289 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	290 Logger::cout() << "constant struct initializer: " << *c << '\n';
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	291 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	292 assert(getABITypeSize(c->getType()) == structsize);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	293 return c;
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	294 }
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	295
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	296 //////////////////////////////////////////////////////////////////////////////////////////
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	297
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 656 diff changeset	298 LLValue* DtoIndexStruct(LLValue* src, StructDeclaration* sd, VarDeclaration* vd)
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	299 {
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 656 diff changeset	300 Logger::println("indexing struct field %s:", vd->toPrettyChars());
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	301 LOG_SCOPE;
058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	302
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 656 diff changeset	303 // vd must be a field
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 656 diff changeset	304 IrField* field = vd->ir.irField;
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 656 diff changeset	305 assert(field);
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 656 diff changeset	306
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	307 // get the start pointer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	308 const LLType* st = getPtrToType(DtoType(sd->type));
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	309
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	310 // cast to the formal struct type
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 656 diff changeset	311 src = DtoBitCast(src, st);
5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 656 diff changeset	312
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	313 // gep to the index
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	314 LLValue* val = DtoGEPi(src, 0, field->index);
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 656 diff changeset	315
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	316 // do we need to offset further? (union area)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	317 if (field->unionOffset)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	318 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	319 // cast to void*
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	320 val = DtoBitCast(val, getVoidPtrType());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	321 // offset
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	322 val = DtoGEPi1(val, field->unionOffset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	323 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	324
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	325 // cast it to the right type
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	326 val = DtoBitCast(val, getPtrToType(DtoType(vd->type)));
585 fbb1a366cfbc Complex number should now follow the D ABI on x86. They're also treated as first class values now. Big change. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 486 diff changeset	327
622 26fce59fe80a Wrapped all the most potentially expensive logging calls in a conditional to only do work when actually requested. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 585 diff changeset	328 if (Logger::enabled())
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 656 diff changeset	329 Logger::cout() << "value: " << *val << '\n';
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	330
705 5a2983f97498 Fixed weird struct problem from downs, see mini/compile_structs1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 656 diff changeset	331 return val;
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	332 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	333
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	334 void DtoResolveStruct(StructDeclaration* sd)
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	335 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	336 // don't do anything if already been here
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	337 if (sd->ir.resolved) return;
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	338 // make sure above works :P
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	339 sd->ir.resolved = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	340
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	341 // log what we're doing
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	342 Logger::println("Resolving struct type: %s (%s)", sd->toChars(), sd->locToChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	343 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	344
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	345 // get the DMD TypeStruct
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	346 TypeStruct* ts = (TypeStruct*)sd->type;
171 95f07e3f8bb9 [svn r187] Fixed missing definitions of instances of imported struct template declarations. lindquist parents: 169 diff changeset	347
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	348 // create the IrStruct
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	349 IrStruct* irstruct = new IrStruct(sd);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	350 sd->ir.irStruct = irstruct;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	351
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	352 // create the type
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	353 ts->ir.type = new LLPATypeHolder(llvm::OpaqueType::get());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	354
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	355 // handle forward declaration structs (opaques)
737 041c1596d217 Removed warnings on ignored aligns. Only do aligment on packed structs, align(1) struct Packed { ... } Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 725 diff changeset	356 // didn't even know D had those ...
656 a15ccbf7451d Support structs that are merely a forward reference. See mini/forwdecl1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 622 diff changeset	357 if (sd->sizeok != 1)
a15ccbf7451d Support structs that are merely a forward reference. See mini/forwdecl1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 622 diff changeset	358 {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	359 // nothing more to do
656 a15ccbf7451d Support structs that are merely a forward reference. See mini/forwdecl1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 622 diff changeset	360 return;
a15ccbf7451d Support structs that are merely a forward reference. See mini/forwdecl1.d Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 622 diff changeset	361 }
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	362
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	363 // make this struct current
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	364 gIR->structs.push_back(irstruct);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	365
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	366 // get some info
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	367 bool ispacked = (ts->alignsize() == 1);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	368 bool isunion = sd->isUnionDeclaration();
737 041c1596d217 Removed warnings on ignored aligns. Only do aligment on packed structs, align(1) struct Packed { ... } Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 725 diff changeset	369
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	370 // set irstruct info
435 74101be2a553 Added type param to DVarValue as DMD sometimes overrides the type of the VarDeclaration. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 351 diff changeset	371 irstruct->packed = ispacked;
74101be2a553 Added type param to DVarValue as DMD sometimes overrides the type of the VarDeclaration. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 351 diff changeset	372
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	373 // defined in this module?
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	374 bool thisModule = false;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	375 if (sd->getModule() == gIR->dmodule)
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	376 thisModule = true;
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	377
725 3e143b611c1e Fix double field toObjFile for structs with AttribDecls. Christian Kamm <kamm incasoftware de> parents: 705 diff changeset	378 // methods, fields
3e143b611c1e Fix double field toObjFile for structs with AttribDecls. Christian Kamm <kamm incasoftware de> parents: 705 diff changeset	379 Array* arr = sd->members;
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	380 for (int k=0; k < arr->dim; k++) {
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	381 Dsymbol* s = (Dsymbol*)arr->data[k];
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	382 s->toObjFile(0);
133 44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	383 }
44a95ac7368a [svn r137] Many fixes towards tango.io.Console working, but not quite there yet... lindquist parents: 132 diff changeset	384
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	385 const LLType* ST = irstruct->build();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	386
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	387 #if 0
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	388 std::cout << sd->kind() << ' ' << sd->toPrettyChars() << " type: " << *ST << '\n';
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	389
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	390 // add fields
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	391 for (int k=0; k < fields->dim; k++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	392 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	393 VarDeclaration* v = (VarDeclaration*)fields->data[k];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	394 printf(" field: %s %s\n", v->type->toChars(), v->toChars());
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	395 printf(" index: %u offset: %u\n", v->ir.irField->index, v->ir.irField->unionOffset);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	396 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	397
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	398 unsigned llvmSize = (unsigned)getABITypeSize(ST);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	399 unsigned dmdSize = (unsigned)sd->type->size();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	400 printf(" llvm size: %u dmd size: %u\n", llvmSize, dmdSize);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	401 assert(llvmSize == dmdSize);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	402
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	403 #endif
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	404
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 121 diff changeset	405 /*for (int k=0; k < sd->members->dim; k++) {
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	406 Dsymbol* dsym = (Dsymbol*)(sd->members->data[k]);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	407 dsym->toObjFile();
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 121 diff changeset	408 }*/
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	409
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	410 Logger::println("doing struct fields");
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	411
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	412 // refine abstract types for stuff like: struct S{S* next;}
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	413 llvm::cast<llvm::OpaqueType>(ts->ir.type->get())->refineAbstractTypeTo(ST);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	414 ST = ts->ir.type->get();
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	415
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	416 // name type
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	417 if (sd->parent->isModule()) {
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	418 gIR->module->addTypeName(sd->mangle(),ST);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	419 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	420
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	421 gIR->structs.pop_back();
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	422
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	423 gIR->declareList.push_back(sd);
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	424 }
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	425
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	426 //////////////////////////////////////////////////////////////////////////////////////////
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	427
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	428 void DtoDeclareStruct(StructDeclaration* sd)
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	429 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	430 if (sd->ir.declared) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	431 sd->ir.declared = true;
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	432
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 121 diff changeset	433 Logger::println("DtoDeclareStruct(%s): %s", sd->toChars(), sd->loc.toChars());
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	434 LOG_SCOPE;
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	435
486 a34078905d01 Added pragma(llvmdc, "string") for misc per-module compiler configuration, currently "string" can only be "verbose" which forces -vv for module it appears in. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 449 diff changeset	436 TypeStruct* ts = (TypeStruct*)sd->type->toBasetype();
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	437
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	438 std::string initname("_D");
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	439 initname.append(sd->mangle());
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	440 initname.append("6__initZ");
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	441
149 4c577c2b7229 [svn r155] Fixed a bunch of linkage problems (especially with templates) lindquist parents: 137 diff changeset	442 llvm::GlobalValue::LinkageTypes _linkage = DtoExternalLinkage(sd);
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	443 llvm::GlobalVariable* initvar = new llvm::GlobalVariable(sd->ir.irStruct->initOpaque.get(), true, _linkage, NULL, initname, gIR->module);
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	444 sd->ir.irStruct->init = initvar;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	445
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	446 gIR->constInitList.push_back(sd);
171 95f07e3f8bb9 [svn r187] Fixed missing definitions of instances of imported struct template declarations. lindquist parents: 169 diff changeset	447 if (DtoIsTemplateInstance(sd) \|\| sd->getModule() == gIR->dmodule)
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	448 gIR->defineList.push_back(sd);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	449 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	450
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	451 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	452
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	453 void DtoConstInitStruct(StructDeclaration* sd)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	454 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	455 if (sd->ir.initialized) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	456 sd->ir.initialized = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	457
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 121 diff changeset	458 Logger::println("DtoConstInitStruct(%s): %s", sd->toChars(), sd->loc.toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	459 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	460
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	461 IrStruct* irstruct = sd->ir.irStruct;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	462 gIR->structs.push_back(irstruct);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	463
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	464 const llvm::StructType* structtype = isaStruct(sd->type->ir.type->get());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	465
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	466 // make sure each offset knows its default initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	467 Array* fields = &sd->fields;
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	468 for (int k=0; k < fields->dim; k++)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	469 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	470 VarDeclaration* v = (VarDeclaration*)fields->data[k];
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	471 LLConstant* finit = DtoConstFieldInitializer(v->loc, v->type, v->init);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	472 v->ir.irField->constInit = finit;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	473 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	474
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	475 // always generate the constant initalizer
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	476 if (sd->zeroInit)
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	477 {
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	478 Logger::println("Zero initialized");
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	479 irstruct->constInit = llvm::ConstantAggregateZero::get(structtype);
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	480 }
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	481 else
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	482 {
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	483 Logger::println("Not zero initialized");
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	484
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	485 LLConstant* c = irstruct->buildDefaultConstInit();
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	486 irstruct->constInit = c;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	487 }
797 340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	488
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	489 // refine __initZ global type to the one of the initializer
340acf1535d0 Removed KDevelop3 project files, CMake can generate them just fine! Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 796 diff changeset	490 llvm::cast<llvm::OpaqueType>(irstruct->initOpaque.get())->refineAbstractTypeTo(irstruct->constInit->getType());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	491
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	492 gIR->structs.pop_back();
102 027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	493
027b8d8b71ec [svn r106] Turns out the last commit wasn't enough, now the D->LLVM process is even more split up. lindquist parents: 100 diff changeset	494 // emit typeinfo
443 44f08170f4ef Removed tango from the repository and instead added a runtime dir with the files needed to patch and build tango from svn. Tomas Lindquist Olsen <tomas.l.olsen@gmail.com> parents: 435 diff changeset	495 if (sd->getModule() == gIR->dmodule && sd->llvmInternal != LLVMno_typeinfo)
275 665b81613475 [svn r296] Removed: the 'suite' dir, it never took off! lindquist parents: 244 diff changeset	496 DtoTypeInfoOf(sd->type, false);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	497 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	498
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	499 //////////////////////////////////////////////////////////////////////////////////////////
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	500
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	501 void DtoDefineStruct(StructDeclaration* sd)
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	502 {
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	503 if (sd->ir.defined) return;
db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	504 sd->ir.defined = true;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	505
132 1700239cab2e [svn r136] MAJOR UNSTABLE UPDATE!!! lindquist parents: 121 diff changeset	506 Logger::println("DtoDefineStruct(%s): %s", sd->toChars(), sd->loc.toChars());
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	507 LOG_SCOPE;
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	508
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	509 assert(sd->type->ty == Tstruct);
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	510 TypeStruct* ts = (TypeStruct*)sd->type;
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	511 sd->ir.irStruct->init->setInitializer(sd->ir.irStruct->constInit);
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	512
173 db9890b3fb64 [svn r189] moving IR data back into DMD frontend nodes ChristianK parents: 171 diff changeset	513 sd->ir.DModule = gIR->dmodule;
100 5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	514 }
5071469303d4 [svn r104] TONS OF FIXES. lindquist parents: 96 diff changeset	515
88 058d3925950e [svn r92] Fixed support for statically initialized unions. lots of bugfixes as cleanups too. lindquist parents: diff changeset	516 //////////////////////////////////////////////////////////////////////////////////////////
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	517 //////////////////////////// D STRUCT UTILITIES ////////////////////////////////////
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	518 //////////////////////////////////////////////////////////////////////////////////////////
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	519
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	520 LLValue* DtoStructEquals(TOK op, DValue* lhs, DValue* rhs)
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	521 {
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	522 Type* t = lhs->getType()->toBasetype();
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	523 assert(t->ty == Tstruct);
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	524
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	525 // set predicate
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	526 llvm::ICmpInst::Predicate cmpop;
345 5320fe65a65d [svn r366] Fixed identity exprs for structs was comparing addresses, not content! lindquist parents: 344 diff changeset	527 if (op == TOKequal \|\| op == TOKidentity)
344 e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	528 cmpop = llvm::ICmpInst::ICMP_EQ;
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	529 else
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	530 cmpop = llvm::ICmpInst::ICMP_NE;
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	531
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	532 // call memcmp
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	533 size_t sz = getABITypeSize(DtoType(t));
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	534 LLValue* val = DtoMemCmp(lhs->getRVal(), rhs->getRVal(), DtoConstSize_t(sz));
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	535 return gIR->ir->CreateICmp(cmpop, val, LLConstantInt::get(val->getType(), 0, false), "tmp");
e20ce6d8d374 [svn r365] Implemented raw struct equality comparison, uses C memcmp. lindquist parents: 336 diff changeset	536 }

Mercurial > projects > ldc

annotate gen/structs.cpp @ 797:340acf1535d0