Index: loader/win32.c
===================================================================
--- loader/win32.c.orig	2007-02-08 13:02:09.000000000 -0800
+++ loader/win32.c	2007-02-08 13:07:43.000000000 -0800
@@ -70,9 +70,6 @@
 #include <kstat.h>
 #endif
 
-#include <sys/mman.h>
-#include "osdep/mmap_anon.h"
-
 #if HAVE_VSSCANF
 int vsscanf( const char *str, const char *format, va_list ap);
 #else
@@ -5437,47 +5433,73 @@
 
 static void ext_stubs(void)
 {
-    volatile int idx = 0xdeadabcd;
-    // make sure gcc does not do eip-relative call or something like that
-    volatile void (*my_printf)(char *, char *) = (void *)0xdeadfbcd;
-    my_printf("Called unk_%s\n", export_names[idx]);
+    // expects:
+    //  ax  position index
+    //  cx  address of printf function
+#if 1
+    __asm__ __volatile__
+	(
+         "push %%edx		\n\t"
+	 "movl $0xdeadbeef, %%eax \n\t"
+	 "movl $0xdeadbeef, %%edx \n\t"
+	 "shl $5, %%eax		\n\t"			// ax * 32
+	 "addl $0xdeadbeef, %%eax \n\t"			// overwrite export_names
+	 "pushl %%eax		\n\t"
+	 "pushl $0xdeadbeef   	\n\t"                   // overwrite called_unk
+	 "call *%%edx		\n\t"                   // printf (via dx)
+	 "addl $8, %%esp	\n\t"
+	 "xorl %%eax, %%eax	\n\t"
+	 "pop %%edx             \n\t"
+	 :
+	 :
+	 : "eax"
+	);
+#else
+    __asm__ __volatile__
+	(
+         "push %%edx		\n\t"
+	 "movl $0, %%eax	\n\t"
+	 "movl $0, %%edx	\n\t"
+	 "shl $5, %%eax		\n\t"			// ax * 32
+	 "addl %0, %%eax	\n\t"
+	 "pushl %%eax		\n\t"
+	 "pushl %1		\n\t"
+	 "call *%%edx		\n\t"                   // printf (via dx)
+	 "addl $8, %%esp	\n\t"
+	 "xorl %%eax, %%eax	\n\t"
+	 "pop %%edx		\n\t"
+	 ::"m"(*export_names), "m"(*called_unk)
+	: "memory", "edx", "eax"
+	);
+#endif
+
 }
 
-#define MAX_STUB_SIZE 0x60
-#define MAX_NUM_STUBS 200
+//static void add_stub(int pos)
+
+extern int unk_exp1;
 static int pos=0;
-static char *extcode = NULL;
+static char extcode[20000];// place for 200 unresolved exports
+static const char* called_unk = "Called unk_%s\n";
 
 static void* add_stub(void)
 {
-    int i;
-    int found = 0;
     // generated code in runtime!
-    char* answ;
-    if (!extcode)
-      extcode = mmap_anon(NULL, MAX_NUM_STUBS * MAX_STUB_SIZE,
-                  PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE, 0);
-    answ = extcode + pos * MAX_STUB_SIZE;
-    if (pos >= MAX_NUM_STUBS) {
-      printf("too many stubs, expect crash\n");
-      return NULL;
-    }
-    memcpy(answ, ext_stubs, MAX_STUB_SIZE);
-    for (i = 0; i < MAX_STUB_SIZE - 3; i++) {
-      int *magic = (int *)(answ + i);
-      if (*magic == 0xdeadabcd) {
-        *magic = pos;
-        found |= 1;
-      }
-      if (*magic == 0xdeadfbcd) {
-        *magic = (intptr_t)printf;
-        found |= 2;
-      }
-    }
-    if (found != 3) {
-      printf("magic code not found in ext_subs, expect crash\n");
-      return NULL;
-    }
+    char* answ = (char*)extcode+pos*0x30;
+#if 0
+    memcpy(answ, &unk_exp1, 0x64);
+    *(int*)(answ+9)=pos;
+    *(int*)(answ+47)-=((int)answ-(int)&unk_exp1);
+#endif
+    memcpy(answ, ext_stubs, 0x2f); // 0x2c is current size
+    //answ[4] = 0xb8; // movl $0, eax  (0xb8 0x00000000)
+    *((int*) (answ + 5)) = pos;
+    //answ[9] = 0xba; // movl $0, edx  (0xba 0x00000000)
+    *((long*) (answ + 10)) = (long)printf;
+    //answ[17] = 0x05; // addl $0, eax  (0x05 0x00000000)
+    *((long*) (answ + 18)) = (long)export_names;
+    //answ[23] = 0x68; // pushl $0  (0x68 0x00000000)
+    *((long*) (answ + 24)) = (long)called_unk;
     pos++;
     return (void*)answ;
 }
@@ -5555,10 +5577,9 @@
 	printf("ERROR: library=0\n");
 	return (void*)ext_unknown;
     }
-    if(name==0)
+    if((unsigned int)name<=0xffff)
     {
-	printf("ERROR: name=0\n");
-	return (void*)ext_unknown;
+        return LookupExternal(library, (int)name);
     }
     dbgprintf("External func %s:%s\n", library, name);
     for(i=0; i<sizeof(libraries)/sizeof(struct libs); i++)
@@ -5569,6 +5590,8 @@
 	{
 	    if(strcmp(name, libraries[i].exps[j].name))
 		continue;
+            if((unsigned int)(libraries[i].exps[j].func) == -1)
+               return NULL; //undefined func
 	    //	    printf("Hit: 0x%08X\n", libraries[i].exps[j].func);
 	    return libraries[i].exps[j].func;
 	}