From 04a280790e771a727c1f63d0be5a3ade8a22a348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20D=C3=B6rfler?= <axeld@pinc-software.de>
Date: Mon, 13 Sep 2004 18:17:47 +0000
Subject: [PATCH] Added some debug output that's going through the kernel debug
 output.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8933 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/kernel/apps/rld/rldelf.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/kernel/apps/rld/rldelf.c b/src/kernel/apps/rld/rldelf.c
index ba58ed87a9..3961e4d6b2 100644
--- a/src/kernel/apps/rld/rldelf.c
+++ b/src/kernel/apps/rld/rldelf.c
@@ -26,11 +26,20 @@
 
 #include "rld_priv.h"
 
+#define TRACE_RLD
+#ifdef TRACE_RLD
+#	define TRACE(x) dprintf x
+#else
+#	define TRACE(x) ;
+#endif
+
+
 // ToDo: implement better locking strategy
 // ToDo: implement unload_program()
 // ToDo: implement load_addon()/unload_addon(): at the very least, we will have to make
 //	sure that B_ADD_ON_IMAGE is set correctly
 // ToDo: implement search paths $LIBRARY_PATH, $ADDON_PATH
+// ToDo: implement lazy binding
 
 #define	PAGE_MASK (B_PAGE_SIZE - 1)
 #define	PAGE_OFFS(y) ((y) & (PAGE_MASK))
@@ -142,6 +151,23 @@ static struct uspace_program_args const *gProgramArgs;
 	}
 
 
+#ifdef TRACE_RLD
+void
+dprintf(const char *format, ...)
+{
+	char buffer[1024];
+
+	va_list list;
+	va_start(list, format);
+	
+	vsnprintf(buffer, sizeof(buffer), format, list);
+	_kern_debug_output(buffer);
+
+	va_end(list);
+}
+#endif
+
+
 static void
 rld_unlock()
 {
@@ -546,6 +572,9 @@ map_image(int fd, char const *path, image_t *image, bool fixed)
 			if (image->regions[i].id < 0)
 				goto error;
 
+			TRACE(("\"%s\" at %p (%s)\n", path, (void *)load_address,
+				image->regions[i].flags & RFLAG_RW ? "rw" : "read-only"));
+
 			image->regions[i].delta = load_address - image->regions[i].vmstart;
 			image->regions[i].vmstart = load_address;
 
@@ -993,6 +1022,8 @@ load_program(char const *path, void **_entry)
 	rld_lock();
 		// for now, just do stupid simple global locking
 
+	TRACE(("rld: load %s\n", path));
+
 	image = load_container(path, MAGIC_APP_NAME, B_APP_IMAGE);
 
 	for (iter = gLoadedImages.head; iter; iter = iter->next) {