Index: arch/amd64/src/dummy.s
===================================================================
--- arch/amd64/src/dummy.s	(revision fa0dfaf69cdac637363e6904e18f89beb568591a)
+++ arch/amd64/src/dummy.s	(revision 3de9e5ea4eb09f92326501d4c5c77977cd08ffcb)
@@ -29,11 +29,8 @@
 .text
 
-.global memcopy
-.global memcpy
 .global cpu_priority_high
 .global cpu_priority_low
 .global cpu_priority_read
 .global cpu_priority_restore
-.global memsetb
 .global userspace
 .global before_thread_runs_arch
@@ -55,11 +52,8 @@
 .global asm_delay_loop
 
-memcpy:	
-memcopy:
 cpu_priority_high:
 cpu_priority_low:
 cpu_priority_restore:
 cpu_priority_read:
-memsetb:
 asm_delay_loop:	
 before_thread_runs_arch:
Index: arch/amd64/src/gencontext.c
===================================================================
--- arch/amd64/src/gencontext.c	(revision 3de9e5ea4eb09f92326501d4c5c77977cd08ffcb)
+++ arch/amd64/src/gencontext.c	(revision 3de9e5ea4eb09f92326501d4c5c77977cd08ffcb)
@@ -0,0 +1,36 @@
+#include <stdio.h>
+
+
+typedef long long __u64;
+typedef __u64 pri_t;
+
+#define __amd64_TYPES_H__
+#include "../include/context.h"
+
+#define FILENAME "context_offset.h"
+
+int main(void)
+{
+    FILE *f;
+    struct context ctx;
+    struct context *pctx = &ctx;
+
+    f = fopen(FILENAME,"w");
+    if (!f) {
+	perror(FILENAME);
+	return 1;
+    }
+
+    fprintf(f,"#define OFFSET_SP  0x%x\n",((int)&pctx->sp) - (int )pctx);
+    fprintf(f,"#define OFFSET_PC  0x%x\n",((int)&pctx->pc) - (int )pctx);
+    fprintf(f,"#define OFFSET_RBX 0x%x\n",((int)&pctx->rbx) - (int )pctx);
+    fprintf(f,"#define OFFSET_RBP 0x%x\n",((int)&pctx->rbp) - (int )pctx);
+    fprintf(f,"#define OFFSET_R12 0x%x\n",((int)&pctx->r12) - (int )pctx);
+    fprintf(f,"#define OFFSET_R13 0x%x\n",((int)&pctx->r13) - (int )pctx);
+    fprintf(f,"#define OFFSET_R14 0x%x\n",((int)&pctx->r14) - (int )pctx);
+    fprintf(f,"#define OFFSET_R15 0x%x\n",((int)&pctx->r15) - (int )pctx);
+    fprintf(f,"#define OFFSET_PRI 0x%x\n",((int)&pctx->pri) - (int )pctx);
+    fclose(f);
+    
+    return 0;
+}
Index: arch/amd64/src/putchar.c
===================================================================
--- arch/amd64/src/putchar.c	(revision fa0dfaf69cdac637363e6904e18f89beb568591a)
+++ 	(revision )
@@ -1,35 +1,0 @@
-/*
- * Copyright (C) 2005 Martin Decky
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <putchar.h>
-#include <arch/types.h>
-
-
-void putchar(const char ch)
-{
-}
Index: arch/amd64/src/supplib.c
===================================================================
--- arch/amd64/src/supplib.c	(revision 3de9e5ea4eb09f92326501d4c5c77977cd08ffcb)
+++ arch/amd64/src/supplib.c	(revision 3de9e5ea4eb09f92326501d4c5c77977cd08ffcb)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2005 Ondrej Palkovsky
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <memstr.h>
+
+/* TODO: Rewrite to assembler */
+
+char *memcpy(void *dst, const void *src, size_t cnt)
+{
+	_memcopy(dst, src, cnt);
+}
+
+char *memcopy(void * dst, const void *src, size_t cnt)
+{
+	_memcopy(dst, src, cnt);
+}
+
+void memsetw(__address dst, size_t cnt, __u16 x)
+{
+	_memsetw(dst, cnt, x);
+}
+
+void memsetb(__address dst, size_t cnt, __u8 x)
+{
+	_memsetb(dst, cnt, x);
+}
+