Index: generic/src/console/kconsole.c
===================================================================
--- generic/src/console/kconsole.c	(revision 7a8c866a8ae0f53b6de307a56f01c3c70e10bbd7)
+++ generic/src/console/kconsole.c	(revision 2312685c8c0b117c244791a714bdb5c3357aae2b)
@@ -119,4 +119,5 @@
 static char carg1_buf[MAX_CMDLINE+1];
 static char carg2_buf[MAX_CMDLINE+1];
+static char carg3_buf[MAX_CMDLINE+1];
 
 static int cmd_call0(cmd_arg_t *argv);
@@ -181,4 +182,35 @@
 };
 
+static int cmd_call3(cmd_arg_t *argv);
+static cmd_arg_t call3_argv[] = {
+	{
+		.type = ARG_TYPE_STRING,
+		.buffer = call0_buf,
+		.len = sizeof(call0_buf)
+	},
+	{ 
+		.type = ARG_TYPE_VAR,
+		.buffer = carg1_buf,
+		.len = sizeof(carg1_buf)
+	},
+	{ 
+		.type = ARG_TYPE_VAR,
+		.buffer = carg2_buf,
+		.len = sizeof(carg2_buf)
+	},
+	{ 
+		.type = ARG_TYPE_VAR,
+		.buffer = carg3_buf,
+		.len = sizeof(carg3_buf)
+	}
+
+};
+static cmd_info_t call3_info = {
+	.name = "call3",
+	.description = "call3 <function> <arg1> <arg2> <arg3> -> call function(arg1,arg2,arg3).",
+	.func = cmd_call3,
+	.argc = 4,
+	.argv = call3_argv
+};
 
 /** Data and methods for 'halt' command. */
@@ -228,4 +260,9 @@
 	if (!cmd_register(&call2_info))
 		panic("could not register command %s\n", call2_info.name);
+
+	spinlock_initialize(&call3_info.lock, "kconsole_call3");
+	link_initialize(&call3_info.link);
+	if (!cmd_register(&call3_info))
+		panic("could not register command %s\n", call3_info.name);
 	
 	spinlock_initialize(&halt_info.lock, "kconsole_halt");
@@ -653,4 +690,31 @@
 }
 
+/** Call function with three parameters */
+int cmd_call3(cmd_arg_t *argv)
+{
+	__address symaddr;
+	char *symbol;
+	__native (*f)(__native,__native,__native);
+	__native arg1 = argv[1].intval;
+	__native arg2 = argv[2].intval;
+	__native arg3 = argv[3].intval;
+
+	symaddr = get_symbol_addr(argv->buffer);
+	if (!symaddr)
+		printf("Symbol %s not found.\n", argv->buffer);
+	else if (symaddr == (__address) -1) {
+		symtab_print_search(argv->buffer);
+		printf("Duplicate symbol, be more specific.\n");
+	} else {
+		symbol = get_symtab_entry(symaddr);
+		printf("Calling f(0x%x,0x%x, 0x%x): 0x%p: %s\n", 
+		       arg1, arg2, arg3, symaddr, symbol);
+		f =  (__native (*)(__native,__native,__native)) symaddr;
+		printf("Result: 0x%x\n", f(arg1, arg2, arg3));
+	}
+	
+	return 1;
+}
+
 
 /** Print detailed description of 'describe' command. */
Index: generic/src/lib/func.c
===================================================================
--- generic/src/lib/func.c	(revision 7a8c866a8ae0f53b6de307a56f01c3c70e10bbd7)
+++ generic/src/lib/func.c	(revision 2312685c8c0b117c244791a714bdb5c3357aae2b)
@@ -136,5 +136,4 @@
 
 	while (*text) {
-		result *= base;
 		if (base != 16 && *text >= 'A' && *text <= 'F')
 			break;
@@ -142,9 +141,11 @@
 			break;
 
-		if (*text >= '0' && *text <= '9')
+		if (*text >= '0' && *text <= '9') {
+			result *= base;
 			result += *text - '0';
-		else if (*text >= 'A' && *text <= 'F')
+		} else if (*text >= 'A' && *text <= 'F') {
+			result *= base;
 			result += *text - 'A' + 10;
-		else
+		} else
 			break;
 		text++;
Index: generic/src/mm/heap.c
===================================================================
--- generic/src/mm/heap.c	(revision 7a8c866a8ae0f53b6de307a56f01c3c70e10bbd7)
+++ generic/src/mm/heap.c	(revision 2312685c8c0b117c244791a714bdb5c3357aae2b)
@@ -65,9 +65,9 @@
 	chunk_t *x, *y, *z;
 
-	size = ALIGN_UP(size, sizeof(__native));
-
 	if (size == 0)
 		panic("zero-size allocation request");
 		
+	size = ALIGN_UP(size, sizeof(__native));
+
 	x = chunk0;
 	ipl = interrupts_disable();