projects/ddmd: dmd/Library.d comparison

comparison dmd/Library.d @ 178:e3afd1303184

Many small bugs fixed Made all classes derive from TObject to detect memory leaks (functionality is disabled for now) Began work on overriding backend memory allocations (to avoid memory leaks)

author	korDen
date	Sun, 17 Oct 2010 07:42:00 +0400
parents	e7769d53e750
children	190ba98276b3

comparison

equal deleted inserted replaced

-:1475fd394c9e
+:e3afd1303184
 }
 memcpy(name, p, len);
 name[len] = 0;
 *pp = p + len;
 	return len;
 }
 static ushort parseIdx(ubyte** pp)
 {
 extern (C) int D_NameCompare(const(void*) a, const(void*) b)
 {
 	ObjSymbol** p1 = cast(ObjSymbol**)a;
 	ObjSymbol** p2 = cast(ObjSymbol**)b;
 return cmp((*p1).name, (*p2).name);
 }
 version (Windows)
 {
 /*******************************************
 * Write a single entry into dictionary.
 * Returns:
 *	0	failure
 */
 extern (C) extern uint _rotl(uint value, int shift);
 extern (C) extern uint _rotr(uint value, int shift);
 static int EnterDict(ubyte* bucketsP, ushort ndicpages, ubyte* entry, uint entrylen)
 {
 }
 return 0;
 }
-class Library
+import dmd.TObject;
+class Library : TObject
 {
 File libfile;
 Array objmodules;	// ObjModule[]
 Array objsymbols;	// ObjSymbol[]
 StringTable tab;
 this()
 	{
+		register();
 		libfile = null;
 		objmodules = new Array();
 		objsymbols = new Array();
-		tab = new StringTable();
 	}
 	/***********************************
 	 * Set the library file name based on the output directory
 	 * and the filename.
 	 */
 void setFilename(string dir, string filename)
 	{
 		string arg = filename;
 		if (arg.length == 0)
 		{
 			// Generate lib file name from first obj name
 			string n = (cast(String)global.params.objfiles.data[0]).str;
 			n = FileName.name(n);
 			FileName fn = FileName.forceExt(n, global.lib_ext);
 		{
 			error("COFF libraries not supported");
 			return;
 		}
 		else
 		{
 			// Not a library, assume OMF object module
 			g_page_size = 16;
 		}
 		/* Split up the buffer buf[0..buflen] into multiple object modules,
 			switch (recTyp)
 			{
 				case LHEADR :
 				case THEADR :
 					if (!om)
 					{
 						char name[LIBIDMAX + 1];
 						om = new ObjModule();
 						om.flags = 0;
 						om.base = p;
 						p += 3;
 						parseName(&p, name.ptr);
 						if (first_module && module_name && !islibrary)
 						{
 							// Remove path and extension
 							string fname = FileName.name(module_name);
 							string ext = FileName.ext(fname);
 							if (ext.length != 0) {
 								fname = fname[0..$-ext.length-1];
 							}
 							om.name = fname;
 						}
 						else
 						{
 							/* Use THEADR name as module name,
 							 * removing path and extension.
 							 */
 							string fname = FileName.name(fromStringz(name.ptr));
 							string ext = FileName.ext(fname);
 							if (ext.length != 0) {
 								fname = fname[0..$-ext.length-1];
 							}
 							om.name = fname;
 							om.flags |= MFtheadr;
 						}
 						if (strcmp(name.ptr, "C".ptr) == 0)	   // old C compilers did this
 						{
 							om.flags |= MFgentheadr;  // generate our own THEADR
 							om.base = pnext;	   // skip past THEADR
 						}
 						objmodules.push(cast(void*)om);
 						first_module = 0;
 					break;
 				case MODEND :
 				case M386END:
 					if (om)
 					{
 						om.page = cast(ushort)((om.base - pstart) / g_page_size);
 						om.length = pnext - om.base;
 						om = null;
 					}
 					// Round up to next page
 					uint t = pnext - pstart;
 					t = (t + g_page_size - 1) & ~cast(uint)(g_page_size - 1);
 					pnext = pstart + t;
 					break;
 				default:
 					// ignore
 					;
 			}
 		}
 		if (om)
 void addSymbol(ObjModule* om, string name, int pickAny = 0)
 	{
 	version (LOG) {
 		printf("Library.addSymbol(%s, %s, %d)\n", om.name, name, pickAny);
 	}
-		StringValue* s = tab.insert(name);
+		Object* s = tab.insert(name);
 		if (!s)
 		{
 			// already in table
 			if (!pickAny)
 			{
 				s = tab.lookup(name);
 				assert(s);
-				ObjSymbol* os = cast(ObjSymbol*)s.ptrvalue;
+				ObjSymbol* os = *cast(ObjSymbol**)s;
 				error("multiple definition of %s: %s and %s: %s",
 				om.name, name, os.om.name, os.name);
 			}
 		}
 		else
 		{
 			ObjSymbol* os = new ObjSymbol();
 			os.name = name;
 			os.om = om;
-			s.ptrvalue = cast(void*)os;
+			*s = cast(Object)cast(void*)os; /// !!!!
 			objsymbols.push(os);
 		}
 	}
 void scanObjModule(ObjModule* om)
 	{
 		int easyomf;
 		uint u;
 		ubyte result = 0;
 					result = 1;
 					goto Ret;
 				case COMENT:
 					// Recognize Phar Lap EASY-OMF format
 					{
 						enum ubyte[7] omfstr = [0x80,0xAA,'8','0','3','8','6'];
 						if (recLen == omfstr.sizeof)
 						{
 							for (uint i = 0; i < omfstr.sizeof; i++)
 							break;
 							L1:	;
 						}
 					}
 					// Recognize .IMPDEF Import Definition Records
 					{
 						enum ubyte[3] omfstr = [0, 0xA0, 1];
 						if (recLen >= 7)
 						{
 							p++;
 						}
 					}
 					break;
 				default:
 					// ignore
 					;
 			}
 		}
 	Ret:
 		;
 		///for (u = 1; u < names.dim; u++)
 		///	free(names.data[u]);
 	}
 	/***********************************
 	 * Calculates number of pages needed for dictionary
 	 * Returns:
 	 *	number of pages
 	 */
 		ushort	bucksForHash;
 		ushort	bucksForSize;
 		uint symSize = 0;
 		for (int i = 0; i < objsymbols.dim; i++)
 		{
 			ObjSymbol* s = cast(ObjSymbol*)objsymbols.data[i];
 			symSize += ( s.name.length + 4 ) & ~1;
 		}
 		for (int i = 0; i < objmodules.dim; i++)
 		{
 			ObjModule* om = cast(ObjModule*)objmodules.data[i];
 			size_t len = om.name.length;
 			if (len > 0xFF)
 				len += 2;			// Digital Mars long name extension
 		];
 		for (int i = 0; 1; i++)
 		{
 			if ( primes[i] == 0 )
 			{
 				// Quick and easy way is out.
 				// Now try and find first prime number > ndicpages
 				uint prime;
 				for (prime = (ndicpages + 1) | 1; 1; prime += 2)
 			}
 		}
 		return ndicpages;
 	}
 	/*******************************************
 	 * Write the module and symbol names to the dictionary.
 	 * Returns:
 	 *	0	failure
 	 */
 		//printf("FillDict()\n");
 		// Add each of the module names
 		for (int i = 0; i < objmodules.dim; i++)
 		{
 			ObjModule* om = cast(ObjModule*)objmodules.data[i];
 			ushort n = cast(ushort)om.name.length;
 			if (n > 255)
 			{
 				entry[0] = 0xFF;
 				entry[1] = 0;
 				*cast(ushort*)(entry.ptr + 2) = cast(ushort)(n + 1);
 				memcpy(entry.ptr + 4, om.name.ptr, n);
 				n += 3;
 			}
 			else
 			{
 				entry[ 0 ] = cast(ubyte)(1 + n);
 				memcpy(entry.ptr + 1, om.name.ptr, n );
 			}
 			entry[ n + 1 ] = '!';
 			*(cast(ushort*)( n + 2 + entry.ptr )) = om.page;
 		// Sort the symbols
 		qsort( objsymbols.data, objsymbols.dim, 4, /*(cmpfunc_t)*/&D_NameCompare );
 		// Add each of the symbols
 		for (int i = 0; i < objsymbols.dim; i++)
 		{
 			ObjSymbol* os = cast(ObjSymbol*)objsymbols.data[i];
 			ushort n = cast(ushort)os.name.length;
 			if (n > 255)
 			{
 				entry[0] = 0xFF;
 				entry[1] = 0;
 				*cast(ushort*)(entry.ptr + 2) = n;
 				memcpy(entry.ptr + 4, os.name.ptr, n);
 				n += 3;
 			}
 			else
 			{
 				entry[ 0 ] = cast(ubyte)n;
 				memcpy( entry.ptr + 1, os.name.ptr, n );
 			}
 			*(cast(ushort*)( n + 1 + entry.ptr )) = os.om.page;
 			if ( (n & 1) == 0 )
 			}
 		}
 		return 1;
 	}
 	/**********************************************
 	 * Create and write library to libbuf.
 	 * The library consists of:
 	 *	library header
 	 *	object modules...
 	{
 		/* Scan each of the object modules for symbols
 		 * to go into the dictionary
 		 */
 		for (int i = 0; i < objmodules.dim; i++)
 		{
 			ObjModule* om = cast(ObjModule*)objmodules.data[i];
 			scanObjModule(om);
 		}
 		uint g_page_size = 16;
 			printf("g_page_size = %d\n", g_page_size);
 	}
 			uint offset = g_page_size;
 			for (int i = 0; i < objmodules.dim; i++)
 			{
 				ObjModule* om = cast(ObjModule*)objmodules.data[i];
 				uint page = offset / g_page_size;
 				if (page > 0xFFFF)
 				{
 		libbuf.fill0(g_page_size);
 		/* Write each object module into the library
 		 */
 		for (int i = 0; i < objmodules.dim; i++)
 		{
 			ObjModule* om = cast(ObjModule*)objmodules.data[i];
 			uint page = libbuf.offset / g_page_size;
 			assert(page <= 0xFFFF);
 			om.page = cast(ushort)page;
 				// Compute and store record checksum
 				uint n = size + 4;
 				ubyte checksum = 0;
 				ubyte* p = header.ptr;
 				while (n--)
 				{
 					checksum -= *p;
 					p++;
 				}
 				*p = checksum;
 			{
 				// 'next available' slot
 				bucketsP[u * BUCKETPAGE + HASHMOD] = (HASHMOD + 1) >> 1;
 			}
 			if (FillDict(bucketsP, ndicpages))
 				break;
 			padding += 16;      // try again with more margins
 		}
 		// Write dictionary
 	}
 }
 } // version (Windows)
 else version(TARGET_LINUX)
 {
-class Library
+import dmd.TObject;
+class Library : TObject
 {
 void setFilename(string dir, string filename)
 {
 	assert(0);
 }
 void addObject(string module_name, void *buf, size_t buflen)
 {
 	assert(0);
 }
 void write()
 {
 	assert(0);
 }
 }
 }

Mercurial > projects > ddmd

comparison dmd/Library.d @ 178:e3afd1303184