 @@ -1,14 +1,14 @@
-/*	$NetBSD: main.c,v 1.10 2012/02/24 18:45:20 skrll Exp $	*/
+/*	$NetBSD: main.c,v 1.11 2013/06/15 00:41:56 christos Exp $	*/
 /*
  * Copyright (c) 2003 ITOH Yasufumi.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary forms are unlimited.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS''
 @@ -31,29 +31,29 @@
 #include <sys/exec_elf.h>
 #include "readufs.h"
 #define STACK_SIZE	((unsigned) (64*1024))
 #define LOAD_ALIGN	((unsigned) 2048)
 #define PZ_MEM_BOOT	0x3d0
 #define DEV_CLASS	0x2c
 #define DEV_CL_MASK	0xf
 #define DEV_CL_SEQU	0x2	/* sequential record access media */
 static char *hexstr(char *, unsigned);
 void ipl_main(unsigned /*interactive*/, unsigned /*sptop*/, unsigned /*psw*/);
-void load_file(const char *, unsigned /*loadadr*/, unsigned /*interactive*/,
+void load_file(const char *, uintptr_t /*loadadr*/, unsigned /*interactive*/,
     int /*part*/);
-void load_file_ino(ino32_t, const char *, unsigned /*loadadr*/,
+void load_file_ino(ino32_t, const char *, uintptr_t /*loadadr*/,
     unsigned /*interactive*/, int /*part*/);
 struct loadinfo {
 	void *sec_image;
 	unsigned sec_size;
 #if 0
 	unsigned sec_pad;
 #endif
 	unsigned entry_offset;
 };
 static inline void xi_elf32(struct loadinfo *, Elf32_Ehdr *);
 static inline void xi_elf64(struct loadinfo *, Elf64_Ehdr *);
 int xi_load(struct loadinfo *, void *);
 @@ -174,27 +174,27 @@ hexstr(char *buf, unsigned val)
 	return buf;
+}
 void
 ipl_main(unsigned interactive, unsigned sptop, unsigned psw)
 	/* interactive:		 parameters from PDC */
 	/* sptop:			 value of sp on function entry */
 	/* psw:			 PSW on startup */
+{
 	char buf[32];
 	int part = 0;		/* default partition "a" */
 	unsigned secsz, partoff, partsz;
 	int c, c1;
-	unsigned loadadr;
+	uintptr_t loadadr;
 #if 0
 	print(hexstr(buf, interactive));
 	print(str_crlf);
 	print(hexstr(buf, sptop));
 	print(str_crlf);
 	print(hexstr(buf, psw));
 	print(str_crlf);
 #endif
 	print(hexstr(buf, (psw & 0x08000000) ? (unsigned) 0x64 : 0x32));
 	print(str_bit_firmware);	/* "bit firmware\r\n" */
 @@ -284,38 +284,38 @@ ipl_main(unsigned interactive, unsigned
+	}
 	str_filesystem[12] = (ufs_info.fstype == UFSTYPE_FFS) ? 'F' : 'L';
 	print(str_filesystem);		/* "filesystem: _FS\r\n" */
 	loadadr = (sptop + STACK_SIZE + LOAD_ALIGN - 1) & (-LOAD_ALIGN);
 	load_file(str_boot1, loadadr, interactive, part); /* "boot.hp700" */
 	load_file(str_boot2, loadadr, interactive, part); /* "boot" */
 	load_file(str_boot3, loadadr, interactive, part); /* "usr/mdec/boot" */
 	print(str_noboot);		/* "no secondary boot found\r\n" */
+}
 void
-load_file(const char *path, unsigned loadadr, unsigned interactive, int part)
+load_file(const char *path, uintptr_t loadadr, unsigned interactive, int part)
+{
 	/* look-up the file */
 	print(str_lookup);	/* "looking up " */
 	print(path);
 	print(str_crlf);
 	load_file_ino(ufs_lookup_path(path), path, loadadr, interactive, part);
+}
 void
-load_file_ino(ino32_t ino, const char *fn, unsigned loadadr, unsigned interactive, int part)
+load_file_ino(ino32_t ino, const char *fn, uintptr_t loadadr, unsigned interactive, int part)
 	/* fn:		 for message only */
+{
 	union ufs_dinode dinode;
 	size_t sz;
 	struct loadinfo inf;
 	char buf[32];
 	if (ino == 0 || ufs_get_inode(ino, &dinode))
 		return;		/* not found */
 	print(str_loading);		/* "loading " */
 	print(fn);
 	print(str_at);			/* " at 0x" */