diff options
-rw-r--r-- | sys/alpha/linux/linux_sysvec.c | 9 | ||||
-rw-r--r-- | sys/compat/linux/linux_file.c | 10 | ||||
-rw-r--r-- | sys/compat/linux/linux_ioctl.c | 24 | ||||
-rw-r--r-- | sys/compat/linux/linux_misc.c | 57 | ||||
-rw-r--r-- | sys/compat/linux/linux_signal.c | 16 | ||||
-rw-r--r-- | sys/i386/linux/imgact_linux.c | 15 | ||||
-rw-r--r-- | sys/i386/linux/linux_file.c | 10 | ||||
-rw-r--r-- | sys/i386/linux/linux_ioctl.c | 24 | ||||
-rw-r--r-- | sys/i386/linux/linux_misc.c | 57 | ||||
-rw-r--r-- | sys/i386/linux/linux_signal.c | 16 | ||||
-rw-r--r-- | sys/i386/linux/linux_sysvec.c | 9 |
11 files changed, 131 insertions, 116 deletions
diff --git a/sys/alpha/linux/linux_sysvec.c b/sys/alpha/linux/linux_sysvec.c index f63b9aa..850263f 100644 --- a/sys/alpha/linux/linux_sysvec.c +++ b/sys/alpha/linux/linux_sysvec.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_sysvec.c,v 1.29 1998/05/07 00:42:25 eivind Exp $ + * $Id: linux_sysvec.c,v 1.30 1998/06/07 17:11:27 dfr Exp $ */ /* XXX we use functions that might not exist. */ @@ -195,8 +195,8 @@ linux_sendsig(sig_t catcher, int sig, int mask, u_long code) oonstack = psp->ps_sigstk.ss_flags & SS_ONSTACK; #ifdef DEBUG - printf("Linux-emul(%d): linux_sendsig(%8x, %d, %d, %ld)\n", - p->p_pid, catcher, sig, mask, code); + printf("Linux-emul(%ld): linux_sendsig(%p, %d, %d, %lu)\n", + (long)p->p_pid, catcher, sig, mask, code); #endif /* * Allocate space for the signal handler context. @@ -309,7 +309,8 @@ linux_sigreturn(p, args) regs = p->p_md.md_regs; #ifdef DEBUG - printf("Linux-emul(%d): linux_sigreturn(%8x)\n", p->p_pid, args->scp); + printf("Linux-emul(%ld): linux_sigreturn(%p)\n", + (long)p->p_pid, (void *)args->scp); #endif /* * The trampoline code hands us the context. diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 32d7cbe..c05c16b 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_file.c,v 1.19 1998/01/05 01:17:42 jmb Exp $ + * $Id: linux_file.c,v 1.20 1998/03/29 07:59:09 peter Exp $ */ #include "opt_compat.h" @@ -339,8 +339,8 @@ linux_lseek(struct proc *p, struct linux_lseek_args *args) int error; #ifdef DEBUG - printf("Linux-emul(%d): lseek(%d, %d, %d)\n", - p->p_pid, args->fdes, args->off, args->whence); + printf("Linux-emul(%ld): lseek(%d, %ld, %d)\n", + (long)p->p_pid, args->fdes, args->off, args->whence); #endif tmp_args.fd = args->fdes; tmp_args.offset = (off_t)args->off; @@ -796,8 +796,8 @@ linux_readlink(struct proc *p, struct linux_readlink_args *args) CHECKALTEXIST(p, &sg, args->name); #ifdef DEBUG - printf("Linux-emul(%d): readlink(%s, 0x%x, %d)\n", - p->p_pid, args->name, args->buf, args->count); + printf("Linux-emul(%ld): readlink(%s, %p, %d)\n", + (long)p->p_pid, args->name, (void *)args->buf, args->count); #endif bsd.path = args->name; bsd.buf = args->buf; diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index ed5f751..4635088 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_ioctl.c,v 1.23 1997/12/15 06:09:11 msmith Exp $ + * $Id: linux_ioctl.c,v 1.24 1998/06/07 17:11:26 dfr Exp $ */ #include <sys/param.h> @@ -247,10 +247,9 @@ bsd_to_linux_termios(struct termios *bsd_termios, linux_termios->c_line = 0; #ifdef DEBUG printf("LINUX: LINUX termios structure (output):\n"); - printf("i=%08x o=%08x c=%08x l=%08x line=%d\n", - linux_termios->c_iflag, linux_termios->c_oflag, - linux_termios->c_cflag, linux_termios->c_lflag, - linux_termios->c_line); + printf("i=%08lx o=%08lx c=%08lx l=%08lx line=%d\n", + linux_termios->c_iflag, linux_termios->c_oflag, linux_termios->c_cflag, + linux_termios->c_lflag, linux_termios->c_line); printf("c_cc "); for (i=0; i<LINUX_NCCS; i++) printf("%02x ", linux_termios->c_cc[i]); @@ -266,10 +265,9 @@ linux_to_bsd_termios(struct linux_termios *linux_termios, int i; #ifdef DEBUG printf("LINUX: LINUX termios structure (input):\n"); - printf("i=%08x o=%08x c=%08x l=%08x line=%d\n", - linux_termios->c_iflag, linux_termios->c_oflag, - linux_termios->c_cflag, linux_termios->c_lflag, - linux_termios->c_line); + printf("i=%08lx o=%08lx c=%08lx l=%08lx line=%d\n", + linux_termios->c_iflag, linux_termios->c_oflag, linux_termios->c_cflag, + linux_termios->c_lflag, linux_termios->c_line); printf("c_cc "); for (i=0; i<LINUX_NCCS; i++) printf("%02x ", linux_termios->c_cc[i]); @@ -460,8 +458,8 @@ linux_ioctl(struct proc *p, struct linux_ioctl_args *args) int error; #ifdef DEBUG - printf("Linux-emul(%d): ioctl(%d, %04x, *)\n", - p->p_pid, args->fd, args->cmd); + printf("Linux-emul(%ld): ioctl(%d, %04lx, *)\n", + (long)p->p_pid, args->fd, args->cmd); #endif if ((unsigned)args->fd >= fdp->fd_nfiles || (fp = fdp->fd_ofiles[args->fd]) == 0) @@ -891,7 +889,7 @@ linux_ioctl(struct proc *p, struct linux_ioctl_args *args) } } uprintf("LINUX: 'ioctl' fd=%d, typ=0x%x(%c), num=0x%x not implemented\n", - args->fd, (args->cmd&0xffff00)>>8, - (args->cmd&0xffff00)>>8, args->cmd&0xff); + args->fd, (u_int)((args->cmd & 0xffff00) >> 8), + (int)((args->cmd & 0xffff00) >> 8), (u_int)(args->cmd & 0xff)); return EINVAL; } diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index a3ca05d..004cf6c 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_misc.c,v 1.38 1998/05/17 11:52:26 phk Exp $ + * $Id: linux_misc.c,v 1.39 1998/07/10 22:30:01 jkh Exp $ */ #include <sys/param.h> @@ -136,7 +136,7 @@ linux_brk(struct proc *p, struct linux_brk_args *args) } */ tmp; #ifdef DEBUG - printf("Linux-emul(%d): brk(%08x)\n", p->p_pid, args->dsend); + printf("Linux-emul(%ld): brk(%p)\n", (long)p->p_pid, (void *)args->dsend); #endif old = (vm_offset_t)vm->vm_daddr + ctob(vm->vm_dsize); new = (vm_offset_t)args->dsend; @@ -307,7 +307,7 @@ linux_uselib(struct proc *p, struct linux_uselib_args *args) */ if (file_offset & PAGE_MASK) { #ifdef DEBUG -printf("uselib: Non page aligned binary %d\n", file_offset); +printf("uselib: Non page aligned binary %lu\n", file_offset); #endif /* * Map text+data read/write/execute @@ -344,7 +344,7 @@ printf("uselib: Non page aligned binary %d\n", file_offset); } else { #ifdef DEBUG -printf("uselib: Page aligned binary %d\n", file_offset); +printf("uselib: Page aligned binary %lu\n", file_offset); #endif /* * for QMAGIC, a_entry is 20 bytes beyond the load address @@ -440,9 +440,10 @@ linux_newselect(struct proc *p, struct linux_newselect_args *args) int error; #ifdef DEBUG - printf("Linux-emul(%d): newselect(%d, %x, %x, %x, %x)\n", - p->p_pid, args->nfds, args->readfds, args->writefds, - args->exceptfds, args->timeout); + printf("Linux-emul(%ld): newselect(%d, %p, %p, %p, %p)\n", + (long)p->p_pid, args->nfds, (void *)args->readfds, + (void *)args->writefds, (void *)args->exceptfds, + (void *)args->timeout); #endif error = 0; bsa.nd = args->nfds; @@ -459,8 +460,8 @@ linux_newselect(struct proc *p, struct linux_newselect_args *args) if ((error = copyin(args->timeout, &utv, sizeof(utv)))) goto select_out; #ifdef DEBUG - printf("Linux-emul(%d): incoming timeout (%d/%d)\n", - p->p_pid, utv.tv_sec, utv.tv_usec); + printf("Linux-emul(%ld): incoming timeout (%ld/%ld)\n", + (long)p->p_pid, utv.tv_sec, utv.tv_usec); #endif if (itimerfix(&utv)) { /* @@ -516,8 +517,8 @@ linux_newselect(struct proc *p, struct linux_newselect_args *args) } else timevalclear(&utv); #ifdef DEBUG - printf("Linux-emul(%d): outgoing timeout (%d/%d)\n", - p->p_pid, utv.tv_sec, utv.tv_usec); + printf("Linux-emul(%ld): outgoing timeout (%ld/%ld)\n", + (long)p->p_pid, utv.tv_sec, utv.tv_usec); #endif if ((error = copyout(&utv, args->timeout, sizeof(utv)))) goto select_out; @@ -593,9 +594,9 @@ linux_mmap(struct proc *p, struct linux_mmap_args *args) sizeof(linux_args)))) return error; #ifdef DEBUG - printf("Linux-emul(%d): mmap(%08x, %d, %d, %08x, %d, %d)\n", - p->p_pid, linux_args.addr, linux_args.len, linux_args.prot, - linux_args.flags, linux_args.fd, linux_args.pos); + printf("Linux-emul(%ld): mmap(%p, %d, %d, %08x, %d, %d)\n", + (long)p->p_pid, (void *)linux_args.addr, linux_args.len, + linux_args.prot, linux_args.flags, linux_args.fd, linux_args.pos); #endif bsd_args.flags = 0; if (linux_args.flags & LINUX_MAP_SHARED) @@ -625,8 +626,9 @@ linux_mremap(struct proc *p, struct linux_mremap_args *args) int error = 0; #ifdef DEBUG - printf("Linux-emul(%d): mremap(%08x, %08x, %08x, %08x)\n", - p->p_pid, args->addr, args->old_len, args->new_len, args->flags); + printf("Linux-emul(%ld): mremap(%p, %08x, %08x, %08x)\n", + (long)p->p_pid, (void *)args->addr, args->old_len, args->new_len, + args->flags); #endif args->new_len = round_page(args->new_len); args->old_len = round_page(args->old_len); @@ -813,8 +815,8 @@ linux_waitpid(struct proc *p, struct linux_waitpid_args *args) int error, tmpstat; #ifdef DEBUG - printf("Linux-emul(%d): waitpid(%d, 0x%x, %d)\n", - p->p_pid, args->pid, args->status, args->options); + printf("Linux-emul(%ld): waitpid(%d, %p, %d)\n", + (long)p->p_pid, args->pid, (void *)args->status, args->options); #endif tmp.pid = args->pid; tmp.status = args->status; @@ -849,8 +851,9 @@ linux_wait4(struct proc *p, struct linux_wait4_args *args) int error, tmpstat; #ifdef DEBUG - printf("Linux-emul(%d): wait4(%d, 0x%x, %d, 0x%x)\n", - p->p_pid, args->pid, args->status, args->options, args->rusage); + printf("Linux-emul(%ld): wait4(%d, %p, %d, %p)\n", + (long)p->p_pid, args->pid, (void *)args->status, args->options, + (void *)args->rusage); #endif tmp.pid = args->pid; tmp.status = args->status; @@ -933,8 +936,8 @@ linux_setitimer(struct proc *p, struct linux_setitimer_args *args) int error; #ifdef DEBUG - printf("Linux-emul(%d): setitimer(%08x, %08x)\n", - p->p_pid, args->itv, args->oitv); + printf("Linux-emul(%ld): setitimer(%p, %p)\n", + (long)p->p_pid, (void *)args->itv, (void *)args->oitv); #endif bsa.which = args->which; bsa.itv = args->itv; @@ -944,8 +947,10 @@ linux_setitimer(struct proc *p, struct linux_setitimer_args *args) sizeof(foo)))) return error; #ifdef DEBUG - printf("setitimer: value: sec: %d, usec: %d\n", foo.it_value.tv_sec, foo.it_value.tv_usec); - printf("setitimer: interval: sec: %d, usec: %d\n", foo.it_interval.tv_sec, foo.it_interval.tv_usec); + printf("setitimer: value: sec: %ld, usec: %ld\n", + foo.it_value.tv_sec, foo.it_value.tv_usec); + printf("setitimer: interval: sec: %ld, usec: %ld\n", + foo.it_interval.tv_sec, foo.it_interval.tv_usec); #endif } return setitimer(p, &bsa); @@ -956,8 +961,8 @@ linux_getitimer(struct proc *p, struct linux_getitimer_args *args) { struct getitimer_args bsa; #ifdef DEBUG - printf("Linux-emul(%d): getitimer(%08x)\n", - p->p_pid, args->itv); + printf("Linux-emul(%ld): getitimer(%p)\n", + (long)p->p_pid, (void *)args->itv); #endif bsa.which = args->which; bsa.itv = args->itv; diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index a85bf65..f901dff 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_signal.c,v 1.9 1997/07/20 16:06:03 bde Exp $ + * $Id: linux_signal.c,v 1.10 1997/11/06 19:29:00 phk Exp $ */ #include <sys/param.h> @@ -113,8 +113,8 @@ linux_sigaction(struct proc *p, struct linux_sigaction_args *args) caddr_t sg = stackgap_init(); #ifdef DEBUG - printf("Linux-emul(%d): sigaction(%d, %08x, %08x)\n", p->p_pid, args->sig, - args->nsa, args->osa); + printf("Linux-emul(%ld): sigaction(%d, %p, %p)\n", + (long)p->p_pid, args->sig, (void *)args->nsa, (void *)args->osa); #endif if (args->osa) @@ -153,8 +153,8 @@ linux_signal(struct proc *p, struct linux_signal_args *args) int error; #ifdef DEBUG - printf("Linux-emul(%d): signal(%d, %08x)\n", p->p_pid, - args->sig, args->handler); + printf("Linux-emul(%ld): signal(%d, %p)\n", + (long)p->p_pid, args->sig, (void *)args->handler); #endif sg = stackgap_init(); nsa = stackgap_alloc(&sg, sizeof *nsa); @@ -241,7 +241,8 @@ linux_sigsetmask(struct proc *p, struct linux_sigsetmask_args *args) sigset_t mask; #ifdef DEBUG - printf("Linux-emul(%d): sigsetmask(%08x)\n", p->p_pid, args->mask); + printf("Linux-emul(%ld): sigsetmask(%p)\n", + (long)p->p_pid, (void *)args->mask); #endif p->p_retval[0] = bsd_to_linux_sigset(p->p_sigmask); @@ -275,7 +276,8 @@ linux_sigsuspend(struct proc *p, struct linux_sigsuspend_args *args) struct sigsuspend_args tmp; #ifdef DEBUG - printf("Linux-emul(%d): sigsuspend(%08x)\n", p->p_pid, args->mask); + printf("Linux-emul(%ld): sigsuspend(%p)\n", + (long)p->p_pid, (void *)args->mask); #endif tmp.mask = linux_to_bsd_sigset(args->mask); return sigsuspend(p, &tmp); diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index eb28e4f..5f85902 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/sys/i386/linux/imgact_linux.c @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: imgact_linux.c,v 1.26 1998/02/09 06:09:16 eivind Exp $ + * $Id: imgact_linux.c,v 1.27 1998/02/11 01:46:49 eivind Exp $ */ #include <sys/param.h> @@ -87,7 +87,8 @@ exec_linux_imgact(imgp) } bss_size = round_page(a_out->a_bss); #ifdef DEBUG - printf("imgact: text: %08x, data: %08x, bss: %08x\n", a_out->a_text, a_out->a_data, bss_size); + printf("imgact: text: %08lx, data: %08lx, bss: %08lx\n", + (u_long)a_out->a_text, (u_long)a_out->a_data, bss_size); #endif /* @@ -126,7 +127,7 @@ exec_linux_imgact(imgp) */ if (file_offset & PAGE_MASK) { #ifdef DEBUG - printf("imgact: Non page aligned binary %d\n", file_offset); + printf("imgact: Non page aligned binary %lu\n", file_offset); #endif /* * Map text+data+bss read/write/execute @@ -167,7 +168,7 @@ exec_linux_imgact(imgp) } else { #ifdef DEBUG - printf("imgact: Page aligned binary %d\n", file_offset); + printf("imgact: Page aligned binary %lu\n", file_offset); #endif /* * Map text+data read/execute @@ -183,7 +184,8 @@ exec_linux_imgact(imgp) return (error); #ifdef DEBUG - printf("imgact: startaddr=%08x, length=%08x\n", vmaddr, a_out->a_text + a_out->a_data); + printf("imgact: startaddr=%08lx, length=%08lx\n", + (u_long)vmaddr, a_out->a_text + a_out->a_data); #endif /* * allow read/write of data @@ -206,7 +208,8 @@ exec_linux_imgact(imgp) if (error) return (error); #ifdef DEBUG - printf("imgact: bssaddr=%08x, length=%08x\n", vmaddr, bss_size); + printf("imgact: bssaddr=%08lx, length=%08lx\n", + (u_long)vmaddr, bss_size); #endif } diff --git a/sys/i386/linux/linux_file.c b/sys/i386/linux/linux_file.c index 32d7cbe..c05c16b 100644 --- a/sys/i386/linux/linux_file.c +++ b/sys/i386/linux/linux_file.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_file.c,v 1.19 1998/01/05 01:17:42 jmb Exp $ + * $Id: linux_file.c,v 1.20 1998/03/29 07:59:09 peter Exp $ */ #include "opt_compat.h" @@ -339,8 +339,8 @@ linux_lseek(struct proc *p, struct linux_lseek_args *args) int error; #ifdef DEBUG - printf("Linux-emul(%d): lseek(%d, %d, %d)\n", - p->p_pid, args->fdes, args->off, args->whence); + printf("Linux-emul(%ld): lseek(%d, %ld, %d)\n", + (long)p->p_pid, args->fdes, args->off, args->whence); #endif tmp_args.fd = args->fdes; tmp_args.offset = (off_t)args->off; @@ -796,8 +796,8 @@ linux_readlink(struct proc *p, struct linux_readlink_args *args) CHECKALTEXIST(p, &sg, args->name); #ifdef DEBUG - printf("Linux-emul(%d): readlink(%s, 0x%x, %d)\n", - p->p_pid, args->name, args->buf, args->count); + printf("Linux-emul(%ld): readlink(%s, %p, %d)\n", + (long)p->p_pid, args->name, (void *)args->buf, args->count); #endif bsd.path = args->name; bsd.buf = args->buf; diff --git a/sys/i386/linux/linux_ioctl.c b/sys/i386/linux/linux_ioctl.c index ed5f751..4635088 100644 --- a/sys/i386/linux/linux_ioctl.c +++ b/sys/i386/linux/linux_ioctl.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_ioctl.c,v 1.23 1997/12/15 06:09:11 msmith Exp $ + * $Id: linux_ioctl.c,v 1.24 1998/06/07 17:11:26 dfr Exp $ */ #include <sys/param.h> @@ -247,10 +247,9 @@ bsd_to_linux_termios(struct termios *bsd_termios, linux_termios->c_line = 0; #ifdef DEBUG printf("LINUX: LINUX termios structure (output):\n"); - printf("i=%08x o=%08x c=%08x l=%08x line=%d\n", - linux_termios->c_iflag, linux_termios->c_oflag, - linux_termios->c_cflag, linux_termios->c_lflag, - linux_termios->c_line); + printf("i=%08lx o=%08lx c=%08lx l=%08lx line=%d\n", + linux_termios->c_iflag, linux_termios->c_oflag, linux_termios->c_cflag, + linux_termios->c_lflag, linux_termios->c_line); printf("c_cc "); for (i=0; i<LINUX_NCCS; i++) printf("%02x ", linux_termios->c_cc[i]); @@ -266,10 +265,9 @@ linux_to_bsd_termios(struct linux_termios *linux_termios, int i; #ifdef DEBUG printf("LINUX: LINUX termios structure (input):\n"); - printf("i=%08x o=%08x c=%08x l=%08x line=%d\n", - linux_termios->c_iflag, linux_termios->c_oflag, - linux_termios->c_cflag, linux_termios->c_lflag, - linux_termios->c_line); + printf("i=%08lx o=%08lx c=%08lx l=%08lx line=%d\n", + linux_termios->c_iflag, linux_termios->c_oflag, linux_termios->c_cflag, + linux_termios->c_lflag, linux_termios->c_line); printf("c_cc "); for (i=0; i<LINUX_NCCS; i++) printf("%02x ", linux_termios->c_cc[i]); @@ -460,8 +458,8 @@ linux_ioctl(struct proc *p, struct linux_ioctl_args *args) int error; #ifdef DEBUG - printf("Linux-emul(%d): ioctl(%d, %04x, *)\n", - p->p_pid, args->fd, args->cmd); + printf("Linux-emul(%ld): ioctl(%d, %04lx, *)\n", + (long)p->p_pid, args->fd, args->cmd); #endif if ((unsigned)args->fd >= fdp->fd_nfiles || (fp = fdp->fd_ofiles[args->fd]) == 0) @@ -891,7 +889,7 @@ linux_ioctl(struct proc *p, struct linux_ioctl_args *args) } } uprintf("LINUX: 'ioctl' fd=%d, typ=0x%x(%c), num=0x%x not implemented\n", - args->fd, (args->cmd&0xffff00)>>8, - (args->cmd&0xffff00)>>8, args->cmd&0xff); + args->fd, (u_int)((args->cmd & 0xffff00) >> 8), + (int)((args->cmd & 0xffff00) >> 8), (u_int)(args->cmd & 0xff)); return EINVAL; } diff --git a/sys/i386/linux/linux_misc.c b/sys/i386/linux/linux_misc.c index a3ca05d..004cf6c 100644 --- a/sys/i386/linux/linux_misc.c +++ b/sys/i386/linux/linux_misc.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_misc.c,v 1.38 1998/05/17 11:52:26 phk Exp $ + * $Id: linux_misc.c,v 1.39 1998/07/10 22:30:01 jkh Exp $ */ #include <sys/param.h> @@ -136,7 +136,7 @@ linux_brk(struct proc *p, struct linux_brk_args *args) } */ tmp; #ifdef DEBUG - printf("Linux-emul(%d): brk(%08x)\n", p->p_pid, args->dsend); + printf("Linux-emul(%ld): brk(%p)\n", (long)p->p_pid, (void *)args->dsend); #endif old = (vm_offset_t)vm->vm_daddr + ctob(vm->vm_dsize); new = (vm_offset_t)args->dsend; @@ -307,7 +307,7 @@ linux_uselib(struct proc *p, struct linux_uselib_args *args) */ if (file_offset & PAGE_MASK) { #ifdef DEBUG -printf("uselib: Non page aligned binary %d\n", file_offset); +printf("uselib: Non page aligned binary %lu\n", file_offset); #endif /* * Map text+data read/write/execute @@ -344,7 +344,7 @@ printf("uselib: Non page aligned binary %d\n", file_offset); } else { #ifdef DEBUG -printf("uselib: Page aligned binary %d\n", file_offset); +printf("uselib: Page aligned binary %lu\n", file_offset); #endif /* * for QMAGIC, a_entry is 20 bytes beyond the load address @@ -440,9 +440,10 @@ linux_newselect(struct proc *p, struct linux_newselect_args *args) int error; #ifdef DEBUG - printf("Linux-emul(%d): newselect(%d, %x, %x, %x, %x)\n", - p->p_pid, args->nfds, args->readfds, args->writefds, - args->exceptfds, args->timeout); + printf("Linux-emul(%ld): newselect(%d, %p, %p, %p, %p)\n", + (long)p->p_pid, args->nfds, (void *)args->readfds, + (void *)args->writefds, (void *)args->exceptfds, + (void *)args->timeout); #endif error = 0; bsa.nd = args->nfds; @@ -459,8 +460,8 @@ linux_newselect(struct proc *p, struct linux_newselect_args *args) if ((error = copyin(args->timeout, &utv, sizeof(utv)))) goto select_out; #ifdef DEBUG - printf("Linux-emul(%d): incoming timeout (%d/%d)\n", - p->p_pid, utv.tv_sec, utv.tv_usec); + printf("Linux-emul(%ld): incoming timeout (%ld/%ld)\n", + (long)p->p_pid, utv.tv_sec, utv.tv_usec); #endif if (itimerfix(&utv)) { /* @@ -516,8 +517,8 @@ linux_newselect(struct proc *p, struct linux_newselect_args *args) } else timevalclear(&utv); #ifdef DEBUG - printf("Linux-emul(%d): outgoing timeout (%d/%d)\n", - p->p_pid, utv.tv_sec, utv.tv_usec); + printf("Linux-emul(%ld): outgoing timeout (%ld/%ld)\n", + (long)p->p_pid, utv.tv_sec, utv.tv_usec); #endif if ((error = copyout(&utv, args->timeout, sizeof(utv)))) goto select_out; @@ -593,9 +594,9 @@ linux_mmap(struct proc *p, struct linux_mmap_args *args) sizeof(linux_args)))) return error; #ifdef DEBUG - printf("Linux-emul(%d): mmap(%08x, %d, %d, %08x, %d, %d)\n", - p->p_pid, linux_args.addr, linux_args.len, linux_args.prot, - linux_args.flags, linux_args.fd, linux_args.pos); + printf("Linux-emul(%ld): mmap(%p, %d, %d, %08x, %d, %d)\n", + (long)p->p_pid, (void *)linux_args.addr, linux_args.len, + linux_args.prot, linux_args.flags, linux_args.fd, linux_args.pos); #endif bsd_args.flags = 0; if (linux_args.flags & LINUX_MAP_SHARED) @@ -625,8 +626,9 @@ linux_mremap(struct proc *p, struct linux_mremap_args *args) int error = 0; #ifdef DEBUG - printf("Linux-emul(%d): mremap(%08x, %08x, %08x, %08x)\n", - p->p_pid, args->addr, args->old_len, args->new_len, args->flags); + printf("Linux-emul(%ld): mremap(%p, %08x, %08x, %08x)\n", + (long)p->p_pid, (void *)args->addr, args->old_len, args->new_len, + args->flags); #endif args->new_len = round_page(args->new_len); args->old_len = round_page(args->old_len); @@ -813,8 +815,8 @@ linux_waitpid(struct proc *p, struct linux_waitpid_args *args) int error, tmpstat; #ifdef DEBUG - printf("Linux-emul(%d): waitpid(%d, 0x%x, %d)\n", - p->p_pid, args->pid, args->status, args->options); + printf("Linux-emul(%ld): waitpid(%d, %p, %d)\n", + (long)p->p_pid, args->pid, (void *)args->status, args->options); #endif tmp.pid = args->pid; tmp.status = args->status; @@ -849,8 +851,9 @@ linux_wait4(struct proc *p, struct linux_wait4_args *args) int error, tmpstat; #ifdef DEBUG - printf("Linux-emul(%d): wait4(%d, 0x%x, %d, 0x%x)\n", - p->p_pid, args->pid, args->status, args->options, args->rusage); + printf("Linux-emul(%ld): wait4(%d, %p, %d, %p)\n", + (long)p->p_pid, args->pid, (void *)args->status, args->options, + (void *)args->rusage); #endif tmp.pid = args->pid; tmp.status = args->status; @@ -933,8 +936,8 @@ linux_setitimer(struct proc *p, struct linux_setitimer_args *args) int error; #ifdef DEBUG - printf("Linux-emul(%d): setitimer(%08x, %08x)\n", - p->p_pid, args->itv, args->oitv); + printf("Linux-emul(%ld): setitimer(%p, %p)\n", + (long)p->p_pid, (void *)args->itv, (void *)args->oitv); #endif bsa.which = args->which; bsa.itv = args->itv; @@ -944,8 +947,10 @@ linux_setitimer(struct proc *p, struct linux_setitimer_args *args) sizeof(foo)))) return error; #ifdef DEBUG - printf("setitimer: value: sec: %d, usec: %d\n", foo.it_value.tv_sec, foo.it_value.tv_usec); - printf("setitimer: interval: sec: %d, usec: %d\n", foo.it_interval.tv_sec, foo.it_interval.tv_usec); + printf("setitimer: value: sec: %ld, usec: %ld\n", + foo.it_value.tv_sec, foo.it_value.tv_usec); + printf("setitimer: interval: sec: %ld, usec: %ld\n", + foo.it_interval.tv_sec, foo.it_interval.tv_usec); #endif } return setitimer(p, &bsa); @@ -956,8 +961,8 @@ linux_getitimer(struct proc *p, struct linux_getitimer_args *args) { struct getitimer_args bsa; #ifdef DEBUG - printf("Linux-emul(%d): getitimer(%08x)\n", - p->p_pid, args->itv); + printf("Linux-emul(%ld): getitimer(%p)\n", + (long)p->p_pid, (void *)args->itv); #endif bsa.which = args->which; bsa.itv = args->itv; diff --git a/sys/i386/linux/linux_signal.c b/sys/i386/linux/linux_signal.c index a85bf65..f901dff 100644 --- a/sys/i386/linux/linux_signal.c +++ b/sys/i386/linux/linux_signal.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_signal.c,v 1.9 1997/07/20 16:06:03 bde Exp $ + * $Id: linux_signal.c,v 1.10 1997/11/06 19:29:00 phk Exp $ */ #include <sys/param.h> @@ -113,8 +113,8 @@ linux_sigaction(struct proc *p, struct linux_sigaction_args *args) caddr_t sg = stackgap_init(); #ifdef DEBUG - printf("Linux-emul(%d): sigaction(%d, %08x, %08x)\n", p->p_pid, args->sig, - args->nsa, args->osa); + printf("Linux-emul(%ld): sigaction(%d, %p, %p)\n", + (long)p->p_pid, args->sig, (void *)args->nsa, (void *)args->osa); #endif if (args->osa) @@ -153,8 +153,8 @@ linux_signal(struct proc *p, struct linux_signal_args *args) int error; #ifdef DEBUG - printf("Linux-emul(%d): signal(%d, %08x)\n", p->p_pid, - args->sig, args->handler); + printf("Linux-emul(%ld): signal(%d, %p)\n", + (long)p->p_pid, args->sig, (void *)args->handler); #endif sg = stackgap_init(); nsa = stackgap_alloc(&sg, sizeof *nsa); @@ -241,7 +241,8 @@ linux_sigsetmask(struct proc *p, struct linux_sigsetmask_args *args) sigset_t mask; #ifdef DEBUG - printf("Linux-emul(%d): sigsetmask(%08x)\n", p->p_pid, args->mask); + printf("Linux-emul(%ld): sigsetmask(%p)\n", + (long)p->p_pid, (void *)args->mask); #endif p->p_retval[0] = bsd_to_linux_sigset(p->p_sigmask); @@ -275,7 +276,8 @@ linux_sigsuspend(struct proc *p, struct linux_sigsuspend_args *args) struct sigsuspend_args tmp; #ifdef DEBUG - printf("Linux-emul(%d): sigsuspend(%08x)\n", p->p_pid, args->mask); + printf("Linux-emul(%ld): sigsuspend(%p)\n", + (long)p->p_pid, (void *)args->mask); #endif tmp.mask = linux_to_bsd_sigset(args->mask); return sigsuspend(p, &tmp); diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index f63b9aa..850263f 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_sysvec.c,v 1.29 1998/05/07 00:42:25 eivind Exp $ + * $Id: linux_sysvec.c,v 1.30 1998/06/07 17:11:27 dfr Exp $ */ /* XXX we use functions that might not exist. */ @@ -195,8 +195,8 @@ linux_sendsig(sig_t catcher, int sig, int mask, u_long code) oonstack = psp->ps_sigstk.ss_flags & SS_ONSTACK; #ifdef DEBUG - printf("Linux-emul(%d): linux_sendsig(%8x, %d, %d, %ld)\n", - p->p_pid, catcher, sig, mask, code); + printf("Linux-emul(%ld): linux_sendsig(%p, %d, %d, %lu)\n", + (long)p->p_pid, catcher, sig, mask, code); #endif /* * Allocate space for the signal handler context. @@ -309,7 +309,8 @@ linux_sigreturn(p, args) regs = p->p_md.md_regs; #ifdef DEBUG - printf("Linux-emul(%d): linux_sigreturn(%8x)\n", p->p_pid, args->scp); + printf("Linux-emul(%ld): linux_sigreturn(%p)\n", + (long)p->p_pid, (void *)args->scp); #endif /* * The trampoline code hands us the context. |