Author: gonzo
Date: Sat Aug 31 01:24:05 2013
New Revision: 255088
URL: http://svnweb.freebsd.org/changeset/base/255088
Log:
YAMON is 32-bit application and uses 32-bit pointers to pass kernel
arguments and environment names/values. Cast values to proper pointer type
to make MALTA kernel 64-bit compatible
Modified:
head/sys/mips/malta/malta_machdep.c
Modified: head/sys/mips/malta/malta_machdep.c
==============================================================================
--- head/sys/mips/malta/malta_machdep.c Fri Aug 30 20:50:28 2013
(r255087)
+++ head/sys/mips/malta/malta_machdep.c Sat Aug 31 01:24:05 2013
(r255088)
@@ -269,8 +269,8 @@ platform_start(__register_t a0, __regist
vm_offset_t kernend;
uint64_t platform_counter_freq;
int argc = a0;
- char **argv = (char **)a1;
- char **envp = (char **)a2;
+ int32_t *argv = (int32_t*)a1;
+ int32_t *envp = (int32_t*)a2;
unsigned int memsize = a3;
int i;
@@ -289,15 +289,20 @@ platform_start(__register_t a0, __regist
printf("entry: platform_start()\n");
bootverbose = 1;
+ /*
+ * YAMON uses 32bit pointers to strings so
+ * convert them to proper type manually
+ */
if (bootverbose) {
printf("cmd line: ");
for (i = 0; i < argc; i++)
- printf("%s ", argv[i]);
+ printf("%s ", (char*)(intptr_t)argv[i]);
printf("\n");
printf("envp:\n");
for (i = 0; envp[i]; i += 2)
- printf("\t%s = %s\n", envp[i], envp[i+1]);
+ printf("\t%s = %s\n", (char*)(intptr_t)envp[i],
+ (char*)(intptr_t)envp[i+1]);
printf("memsize = %08x\n", memsize);
}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
