diff options
| -rw-r--r-- | sys/arch/alpha/alpha/trap.c | 8 | ||||
| -rw-r--r-- | sys/arch/alpha/include/intr.h | 4 | ||||
| -rw-r--r-- | sys/arch/alpha/include/reg.h | 8 | ||||
| -rw-r--r-- | sys/arch/alpha/include/types.h | 10 | ||||
| -rw-r--r-- | sys/kern/exec_elf64.c | 12 |
5 files changed, 21 insertions, 21 deletions
diff --git a/sys/arch/alpha/alpha/trap.c b/sys/arch/alpha/alpha/trap.c index a28209ea907..31e6fa36194 100644 --- a/sys/arch/alpha/alpha/trap.c +++ b/sys/arch/alpha/alpha/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.25 2001/01/20 20:27:40 art Exp $ */ +/* $OpenBSD: trap.c,v 1.26 2001/07/09 18:55:21 millert Exp $ */ /* $NetBSD: trap.c,v 1.52 2000/05/24 16:48:33 thorpej Exp $ */ /*- @@ -602,8 +602,8 @@ syscall(code, framep) int error, numsys; u_int64_t opc; u_quad_t sticks; - u_int64_t rval[2]; - u_int64_t args[10]; /* XXX */ + u_long rval[2]; + u_long args[10]; /* XXX */ u_int hidden, nargs; #ifdef COMPAT_OSF1 extern struct emul emul_osf1; @@ -661,7 +661,7 @@ syscall(code, framep) if (nargs > 10) /* XXX */ panic("syscall: too many args (%d)", nargs); error = copyin((caddr_t)(alpha_pal_rdusp()), &args[6], - (nargs - 6) * sizeof(u_int64_t)); + (nargs - 6) * sizeof(u_long)); case 6: args[5] = framep->tf_regs[FRAME_A5]; case 5: diff --git a/sys/arch/alpha/include/intr.h b/sys/arch/alpha/include/intr.h index 1135b7bdc12..6fb510601a2 100644 --- a/sys/arch/alpha/include/intr.h +++ b/sys/arch/alpha/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.10 2001/06/24 17:05:26 miod Exp $ */ +/* $OpenBSD: intr.h,v 1.11 2001/07/09 18:55:22 millert Exp $ */ /* $NetBSD: intr.h,v 1.25 2000/05/23 05:12:56 thorpej Exp $ */ /* @@ -84,7 +84,7 @@ _splraise(s) /* * simulated software interrupt register */ -extern u_int64_t ssir; +extern u_long ssir; #define SIR_NET 0x1 #define SIR_CLOCK 0x2 diff --git a/sys/arch/alpha/include/reg.h b/sys/arch/alpha/include/reg.h index f7f9dcde9ed..4f0896553c0 100644 --- a/sys/arch/alpha/include/reg.h +++ b/sys/arch/alpha/include/reg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: reg.h,v 1.3 1996/10/30 22:39:25 niklas Exp $ */ +/* $OpenBSD: reg.h,v 1.4 2001/07/09 18:55:22 millert Exp $ */ /* $NetBSD: reg.h,v 1.2 1995/03/28 18:14:07 jtc Exp $ */ /* @@ -74,7 +74,7 @@ #define R_ZERO 31 struct reg { - u_int64_t r_regs[32]; + u_long r_regs[32]; }; /* @@ -87,8 +87,8 @@ struct reg { * That array has to look exactly like 'struct reg' though. */ struct fpreg { - u_int64_t fpr_regs[32]; - u_int64_t fpr_cr; + u_long fpr_regs[32]; + u_long fpr_cr; }; #ifdef _KERNEL diff --git a/sys/arch/alpha/include/types.h b/sys/arch/alpha/include/types.h index b111d7ada10..f3f3f5a2993 100644 --- a/sys/arch/alpha/include/types.h +++ b/sys/arch/alpha/include/types.h @@ -1,4 +1,4 @@ -/* $OpenBSD: types.h,v 1.8 2000/11/16 04:33:47 ericj Exp $ */ +/* $OpenBSD: types.h,v 1.9 2001/07/09 18:55:22 millert Exp $ */ /* $NetBSD: types.h,v 1.6 1996/12/05 00:13:47 cgd Exp $ */ /*- @@ -73,11 +73,11 @@ typedef unsigned short uint16_t; typedef int int32_t; typedef unsigned int u_int32_t; typedef unsigned int uint32_t; -typedef long int64_t; -typedef unsigned long u_int64_t; -typedef unsigned long uint64_t; +typedef long long int64_t; +typedef unsigned long long u_int64_t; +typedef unsigned long long uint64_t; -typedef int64_t register_t; +typedef long register_t; #define __BROKEN_INDIRECT_CONFIG diff --git a/sys/kern/exec_elf64.c b/sys/kern/exec_elf64.c index f055e4ce67a..1a8d8a2f5ed 100644 --- a/sys/kern/exec_elf64.c +++ b/sys/kern/exec_elf64.c @@ -1,4 +1,4 @@ -/* $OpenBSD: exec_elf64.c,v 1.15 2001/06/22 14:14:07 deraadt Exp $ */ +/* $OpenBSD: exec_elf64.c,v 1.16 2001/07/09 18:55:21 millert Exp $ */ /* * Copyright (c) 1996 Per Fogelstrom @@ -106,7 +106,7 @@ int elf64_check_header __P((Elf64_Ehdr *, int)); int olf64_check_header __P((Elf64_Ehdr *, int, u_int8_t *)); int elf64_read_from __P((struct proc *, struct vnode *, u_long, caddr_t, int)); void elf64_load_psection __P((struct exec_vmcmd_set *, struct vnode *, - Elf64_Phdr *, u_long *, u_long *, int *)); + Elf64_Phdr *, u_int64_t *, u_int64_t *, int *)); int exec_elf64_fixup __P((struct proc *, struct exec_package *)); @@ -256,8 +256,8 @@ elf64_load_psection(vcset, vp, ph, addr, size, prot) struct exec_vmcmd_set *vcset; struct vnode *vp; Elf64_Phdr *ph; - u_long *addr; - u_long *size; + u_int64_t *addr; + u_int64_t *size; int *prot; { u_long uaddr, msize, psize, rm, rf; @@ -366,7 +366,7 @@ elf64_load_file(p, path, epp, ap, last) Elf64_Phdr *ph = NULL; u_long phsize; char *bp = NULL; - u_long addr = *last; + u_int64_t addr = *last; struct vnode *vp; u_int8_t os; /* Just a dummy in this routine */ @@ -414,7 +414,7 @@ elf64_load_file(p, path, epp, ap, last) * Load all the necessary sections */ for (i = 0; i < eh.e_phnum; i++) { - u_long size = 0; + u_int64_t size = 0; int prot = 0; #if defined(__mips__) if (*last == ELF64_NO_ADDR) |